From 70b44ad32a79e0746e19a74bde35f49c79f89942 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Tue, 27 Aug 2013 17:20:04 -0700
Subject: revert: fix(mocks): $timeout#flush should not update time when empty

This reverts commit 42af8eada2803a54a98b4f792e60feb480d68a0c.

This turned out to be a bad idea as it prevents us from moving the
time forward and asserting that the component state didn't change
due to the scheduled task executing too early.
---
 src/ngMock/angular-mocks.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/ngMock/angular-mocks.js')

diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index d0c1b9b2..05fdc4ed 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -105,17 +105,16 @@ angular.mock.$Browser = function() {
    */
   self.defer.flush = function(delay) {
     var flushedSomething = false;
-        now = self.defer.now;
 
     if (angular.isDefined(delay)) {
-      now += delay;
+      self.defer.now += delay;
     } else {
       if (self.deferredFns.length) {
-        now = self.deferredFns[self.deferredFns.length-1].time;
+        self.defer.now = self.deferredFns[self.deferredFns.length-1].time;
       }
     }
 
-    while (self.deferredFns.length && self.deferredFns[0].time <= now) {
+    while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {
       flushedSomething = true;
       self.deferredFns.shift().fn();
     }
@@ -127,8 +126,6 @@ angular.mock.$Browser = function() {
         throw Error('No deferred tasks with delay up to ' + delay + 'ms to be flushed!')
       }
     }
-
-    self.defer.now = now;
   };
 
   /**
-- 
cgit v1.2.3