revert: fix(mocks): $timeout#flush should not update time when empty

IgorMinar · IgorMinar · commit 70b44ad32a79 · 2013-08-27T17:21:11.000-07:00
This reverts commit 42af8ea. 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.
diff --git 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;
   };
 
   /**
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
@@ -404,7 +404,7 @@ describe('ngMock', function() {
       expect(function() {$timeout.flush(100);}).toThrow();
       expect(log).toEqual(['t1']);
 
-      $timeout.flush(1000);
+      $timeout.flush(900);
       expect(log).toEqual(['t1', 't2']);
       expect(function() {$timeout.flush();}).toThrow();
     });
@@ -425,21 +425,6 @@ describe('ngMock', function() {
     });
 
 
-    it('should not update the current time if an exception is thrown during a flush', function() {
-      $timeout(log.fn('t1'), 100);
-      $timeout(log.fn('t2'), 101);
-
-      expect(function() { $timeout.flush(90); }).toThrow();
-      expect(function() { $timeout.flush(90); }).toThrow();
-
-      $timeout.flush(100);
-      expect(log).toEqual(['t1']);
-
-      $timeout.flush(1);
-      expect(log).toEqual(['t1', 't2']);
-    });
-
-
     describe('verifyNoPendingTasks', function() {
 
       it('should throw an exception when not flushed', function() {

Original file line number	Diff line number	Diff line change
`@@ -105,17 +105,16 @@ angular.mock.$Browser = function() {`
`105`	`105`	`*/`
`106`	`106`	`self.defer.flush = function(delay) {`
`107`	`107`	`var flushedSomething = false;`
`108`		`- now = self.defer.now;`
`109`	`108`
`110`	`109`	`if (angular.isDefined(delay)) {`
`111`		`- now += delay;`
	`110`	`+ self.defer.now += delay;`
`112`	`111`	`} else {`
`113`	`112`	`if (self.deferredFns.length) {`
`114`		`- now = self.deferredFns[self.deferredFns.length-1].time;`
	`113`	`+ self.defer.now = self.deferredFns[self.deferredFns.length-1].time;`
`115`	`114`	`}`
`116`	`115`	`}`
`117`	`116`
`118`		`- while (self.deferredFns.length && self.deferredFns[0].time <= now) {`
	`117`	`+ while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {`
`119`	`118`	`flushedSomething = true;`
`120`	`119`	`self.deferredFns.shift().fn();`
`121`	`120`	`}`
`@@ -127,8 +126,6 @@ angular.mock.$Browser = function() {`
`127`	`126`	`throw Error('No deferred tasks with delay up to ' + delay + 'ms to be flushed!')`
`128`	`127`	`}`
`129`	`128`	`}`
`130`		`-`
`131`		`- self.defer.now = now;`
`132`	`129`	`};`
`133`	`130`
`134`	`131`	`/**`