Fixes #295 - add test units for $remove returning ref

Author: katowulf

dist/angularfire.js

@@ -1,5 +1,5 @@
 /*!
- * angularfire 0.8.0 2014-07-31
+ * angularfire 0.8.0 2014-08-08
  * https://github.com/firebase/angularfire
  * Copyright (c) 2014 Firebase, Inc.
  * MIT LICENSE: http://firebase.mit-license.org/
@@ -894,14 +894,15 @@
           },
 
           $remove: function (key) {
-            var ref = this._ref, self = this;
+            var ref = this._ref, self = this, promise;
+            var def = $firebaseUtils.defer();
             if (arguments.length > 0) {
               ref = ref.ref().child(key);
             }
-            var def = $firebaseUtils.defer();
             if( angular.isFunction(ref.remove) ) {
               // self is not a query, just do a flat remove
               ref.remove(self._handle(def, ref));
+              promise = def.promise;
             }
             else {
               var promises = [];
@@ -914,9 +915,12 @@
                   ss.ref().remove(self._handle(d, ss.ref()));
                 }, self);
               });
-              self._handle($firebaseUtils.allPromises(promises), ref);
+              promise = $firebaseUtils.allPromises(promises)
+                .then(function() {
+                  return ref;
+                });
             }
-            return def.promise;
+            return promise;
           },
 
           $update: function (key, data) {

dist/angularfire.min.js

@@ -72,14 +72,15 @@
           },
 
           $remove: function (key) {
-            var ref = this._ref, self = this;
+            var ref = this._ref, self = this, promise;
+            var def = $firebaseUtils.defer();
             if (arguments.length > 0) {
               ref = ref.ref().child(key);
             }
-            var def = $firebaseUtils.defer();
             if( angular.isFunction(ref.remove) ) {
               // self is not a query, just do a flat remove
               ref.remove(self._handle(def, ref));
+              promise = def.promise;
             }
             else {
               var promises = [];
@@ -92,9 +93,12 @@
                   ss.ref().remove(self._handle(d, ss.ref()));
                 }, self);
               });
-              self._handle($firebaseUtils.allPromises(promises), ref);
+              promise = $firebaseUtils.allPromises(promises)
+                .then(function() {
+                  return ref;
+                });
             }
-            return def.promise;
+            return promise;
           },
 
           $update: function (key, data) {

src/firebase.js

@@ -216,12 +216,16 @@ describe('$FirebaseArray', function () {
       expect(arr.$remove(1)).toBeAPromise();
     });
 
-    it('should resolve promise on success', function() {
+    it('should resolve promise to ref on success', function() {
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');
+      var expName = arr.$keyAt(1);
       arr.$remove(1).then(whiteSpy, blackSpy);
       flushAll();
+      var resRef = whiteSpy.calls.argsFor(0)[0];
       expect(whiteSpy).toHaveBeenCalled();
+      expect(resRef).toBeAFirebaseRef();
+      expect(resRef.name()).toBe(expName);
       expect(blackSpy).not.toHaveBeenCalled();
     });
 
@@ -692,15 +696,26 @@ describe('$FirebaseArray', function () {
     }
   }
 
+  function lastPartOfKey(key) {
+    var parts = (key||'').split('/');
+    return parts[parts.length-1];
+  }
+
   var pushCounter = 1;
   function stubRef(key) {
     var stub = {};
     stub.$lastPushRef = null;
     stub.ref = jasmine.createSpy('ref').and.returnValue(stub);
     stub.child = jasmine.createSpy('child').and.callFake(function(childKey) { return stubRef(key+'/'+childKey); });
-    stub.name = jasmine.createSpy('name').and.returnValue(key);
+    stub.name = jasmine.createSpy('name').and.returnValue(lastPartOfKey(key));
     stub.on = jasmine.createSpy('on');
     stub.off = jasmine.createSpy('off');
+    stub.once = jasmine.createSpy('once');
+    stub.set = jasmine.createSpy('set');
+    stub.transaction = jasmine.createSpy('transaction');
+    stub.toString = jasmine.createSpy('toString').and.callFake(function() {
+      return 'stub://'+key;
+    });
     stub.push = jasmine.createSpy('push').and.callFake(function() {
       stub.$lastPushRef = stubRef('newpushid-'+(pushCounter++));
       return stub.$lastPushRef;

tests/unit/FirebaseArray.spec.js

@@ -189,6 +189,15 @@ describe('$firebase', function () {
       expect(whiteSpy).toHaveBeenCalledWith($fb.$ref());
     });
 
+    it('should resolve to ref if query', function() {
+      var spy = jasmine.createSpy('resolve');
+      var ref = new Firebase('Mock://').child('ordered').limit(2);
+      var $fb = $firebase(ref);
+      $fb.$remove().then(spy);
+      flushAll();
+      expect(spy).toHaveBeenCalledWith(ref);
+    });
+
     it('should resolve to child ref if key', function() {
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');