Merge remote-tracking branch 'upstream/master' into utils-node-resolver

Conflicts:
	src/FirebaseAuth.js

Author: jamestalmage

.jshintrc

@@ -9,6 +9,7 @@
   "forin": true,
   "indent": 2,
   "latedef": true,
+  "node": true,
   "noempty": true,
   "nonbsp": true,
   "strict": true,

changelog.txt

@@ -0,0 +1,2 @@
+deprecated - Passing in credentials to the user management methods of `$firebaseAuth` as individual arguments has been deprecated in favor of a single credentials argument.
+deprecated - Deprecated `$firebaseAuth.$sendPasswordResetEmail()` in favor of the functionally equivalent `$firebaseAuth.$resetPassword()`.

src/FirebaseAuth.js

@@ -72,33 +72,36 @@
           },
 
           $remove: function (key) {
-            var ref = this._ref, self = this, promise;
+            var ref = this._ref, self = this;
             var def = $firebaseUtils.defer();
             if (arguments.length > 0) {
               ref = ref.ref().child(key);
             }
             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 = [];
               // self is a query so let's only remove the
               // items in the query and not the entire path
               ref.once('value', function(snap) {
+                var promises = [];
                 snap.forEach(function(ss) {
                   var d = $firebaseUtils.defer();
-                  promises.push(d);
-                  ss.ref().remove(self._handle(d, ss.ref()));
+                  promises.push(d.promise);
+                  ss.ref().remove(self._handle(d));
                 }, self);
+                $firebaseUtils.allPromises(promises)
+                  .then(function() {
+                    def.resolve(ref);
+                  },
+                  function(err){
+                    def.reject(err);
+                  }
+                );
               });
-              promise = $firebaseUtils.allPromises(promises)
-                .then(function() {
-                  return ref;
-                });
             }
-            return promise;
+            return def.promise;
           },
 
           $update: function (key, data) {

src/firebase.js

@@ -62,6 +62,7 @@
             var queue = [];
             var start;
             var cancelTimer;
+            var runScheduledForNextTick;
 
             // returns `fn` wrapped in a function that queues up each call event to be
             // invoked later inside fo runNow()
@@ -77,14 +78,17 @@
             }
 
             // clears the current wait timer and creates a new one
-            // however, if maxWait is exceeded, calls runNow() immediately
+            // however, if maxWait is exceeded, calls runNow() on the next tick.
             function resetTimer() {
               if( cancelTimer ) {
                 cancelTimer();
                 cancelTimer = null;
               }
               if( start && Date.now() - start > maxWait ) {
-                utils.compile(runNow);
+                if(!runScheduledForNextTick){
+                  runScheduledForNextTick = true;
+                  utils.compile(runNow);
+                }
               }
               else {
                 if( !start ) { start = Date.now(); }
@@ -96,6 +100,7 @@
             function runNow() {
               cancelTimer = null;
               start = null;
+              runScheduledForNextTick = false;
               var copyList = queue.slice(0);
               queue = [];
               angular.forEach(copyList, function(parts) {
@@ -114,7 +119,7 @@
            * @param {int} [maxWait] max milliseconds to wait before sending out, defaults to wait * 10 or 100
            */
           debounce: function(fn, ctx, wait, maxWait) {
-            var start, cancelTimer, args;
+            var start, cancelTimer, args, runScheduledForNextTick;
             if( typeof(ctx) === 'number' ) {
               maxWait = wait;
               wait = ctx;
@@ -130,25 +135,29 @@
             if( !maxWait ) { maxWait = wait*10 || 100; }
 
             // clears the current wait timer and creates a new one
-            // however, if maxWait is exceeded, calls runNow() immediately
+            // however, if maxWait is exceeded, calls runNow() on the next tick.
             function resetTimer() {
               if( cancelTimer ) {
                 cancelTimer();
                 cancelTimer = null;
               }
               if( start && Date.now() - start > maxWait ) {
-                utils.compile(runNow);
+                if(!runScheduledForNextTick){
+                  runScheduledForNextTick = true;
+                  utils.compile(runNow);
+                }
               }
               else {
                 if( !start ) { start = Date.now(); }
                 cancelTimer = utils.wait(runNow, wait);
               }
             }
 
-            // Clears the queue and invokes all of the functions awaiting notification
+            // Clears the queue and invokes the debounced function with the most recent arguments
             function runNow() {
               cancelTimer = null;
               start = null;
+              runScheduledForNextTick = false;
               fn.apply(ctx, args);
             }
 

src/utils.js

@@ -1,6 +1,6 @@
 grunt build
 grunt test:unit
-if [ $SAUCE_ACCESS_KEY ]; then
-  grunt sauce:unit
+#if [ $SAUCE_ACCESS_KEY ]; then
+  #grunt sauce:unit
   #grunt sauce:e2e
-fi
+#fi

tests/travis.sh

@@ -239,7 +239,8 @@ describe('$firebase', function () {
       var ref = new Firebase('Mock://').child('ordered').limit(2);
       var $fb = $firebase(ref);
       $fb.$remove().then(spy);
-      flushAll();
+      flushAll(ref);
+      flushAll(ref);
       expect(spy).toHaveBeenCalledWith(ref);
     });
 
@@ -305,6 +306,20 @@ describe('$firebase', function () {
         }
       });
     });
+
+    it('should wait to resolve promise until data is actually deleted',function(){
+      var ref = new Firebase('Mock://').child('ordered').limit(2);
+      var $fb = $firebase(ref);
+      var resolved = false;
+      $fb.$remove().then(function(){
+        resolved = true;
+      });
+      try {$timeout.flush();} catch(e){} //this may actually throw an error
+      expect(resolved).toBe(false);
+      flushAll(ref);
+      flushAll(ref);
+      expect(resolved).toBe(true);
+    });
   });
 
   describe('$update', function() {

tests/unit/firebase.spec.js

@@ -51,6 +51,42 @@ describe('$firebaseUtils', function () {
     });
   });
 
+  describe('#debounce', function(){
+    it('should trigger function with arguments',function(){
+      var spy = jasmine.createSpy();
+      $utils.debounce(spy,10)('foo', 'bar');
+      $timeout.flush();
+      expect(spy).toHaveBeenCalledWith('foo', 'bar');
+    });
+
+    it('should only trigger once, with most recent arguments',function(){
+      var spy = jasmine.createSpy();
+      var fn =  $utils.debounce(spy,10);
+      fn('foo', 'bar');
+      fn('baz', 'biz');
+      $timeout.flush();
+      expect(spy.calls.count()).toBe(1);
+      expect(spy).toHaveBeenCalledWith('baz', 'biz');
+    });
+
+    it('should only trigger once (timing corner case)',function(){
+      var spy = jasmine.createSpy();
+      var fn =  $utils.debounce(spy, null, 1, 2);
+      fn('foo', 'bar');
+      var start = Date.now();
+
+      // block for 3ms without releasing
+      while(Date.now() - start < 3){ }
+
+      fn('bar', 'baz');
+      fn('baz', 'biz');
+      expect(spy).not.toHaveBeenCalled();
+      $timeout.flush();
+      expect(spy.calls.count()).toBe(1);
+      expect(spy).toHaveBeenCalledWith('baz', 'biz');
+    });
+  });
+
   describe('#updateRec', function() {
     it('should return true if changes applied', function() {
       var rec = {};