fix: run all timers in passage of time in a single fakeAsync's tick call

kasiditi · mhevery · commit a85db4cd98f8 · 2016-09-30T19:30:57.000-07:00
Closes #454
diff --git a/lib/zone-spec/fake-async-test.ts b/lib/zone-spec/fake-async-test.ts
@@ -51,22 +51,24 @@
     }
     
     tick(millis: number = 0): void {
-      this._currentTime += millis;
-      while (this._schedulerQueue.length > 0) {  
+      let finalTime = this._currentTime + millis;
+      while (this._schedulerQueue.length > 0) {
         let current = this._schedulerQueue[0];        
-        if (this._currentTime < current.endTime) {
+        if (finalTime < current.endTime) {
           // Done processing the queue since it's sorted by endTime.
           break;
         } else {
           // Time to run scheduled function. Remove it from the head of queue.
           let current = this._schedulerQueue.shift();
+          this._currentTime = current.endTime;
           let retval = current.func.apply(global, current.args);
           if (!retval) {
             // Uncaught exception in the current scheduled function. Stop processing the queue.
             break;
           }
         }
       }
+      this._currentTime = finalTime;
     }
   }
   
diff --git a/test/zone-spec/fake-async-test.spec.ts b/test/zone-spec/fake-async-test.spec.ts
@@ -119,6 +119,29 @@ describe('FakeAsyncTestZoneSpec', () => {
       });
     });
 
+    it('should run queued timer created by timer callback', () => {
+      fakeAsyncTestZone.run(() => {
+        let counter = 0;
+        const startCounterLoop = () => {
+          counter++;
+          setTimeout(startCounterLoop, 10);
+        }
+
+        startCounterLoop();
+
+        expect(counter).toEqual(1);
+
+        testZoneSpec.tick(10);
+        expect(counter).toEqual(2);
+
+        testZoneSpec.tick(10);
+        expect(counter).toEqual(3);
+
+        testZoneSpec.tick(30);
+        expect(counter).toEqual(6);
+      });
+    });
+
     it('should run queued timer only once', () => {
       fakeAsyncTestZone.run(() => {
         let cycles = 0;
@@ -160,6 +183,9 @@ describe('FakeAsyncTestZoneSpec', () => {
 
         testZoneSpec.tick(10);
         expect(cycles).toEqual(3);
+
+        testZoneSpec.tick(30);
+        expect(cycles).toEqual(6);
       });
     });
 

Original file line number	Diff line number	Diff line change
`@@ -51,22 +51,24 @@`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`tick(millis: number = 0): void {`
`54`		`- this._currentTime += millis;`
`55`		`- while (this._schedulerQueue.length > 0) {`
	`54`	`+ let finalTime = this._currentTime + millis;`
	`55`	`+ while (this._schedulerQueue.length > 0) {`
`56`	`56`	`let current = this._schedulerQueue[0];`
`57`		`- if (this._currentTime < current.endTime) {`
	`57`	`+ if (finalTime < current.endTime) {`
`58`	`58`	`// Done processing the queue since it's sorted by endTime.`
`59`	`59`	`break;`
`60`	`60`	`} else {`
`61`	`61`	`// Time to run scheduled function. Remove it from the head of queue.`
`62`	`62`	`let current = this._schedulerQueue.shift();`
	`63`	`+ this._currentTime = current.endTime;`
`63`	`64`	`let retval = current.func.apply(global, current.args);`
`64`	`65`	`if (!retval) {`
`65`	`66`	`// Uncaught exception in the current scheduled function. Stop processing the queue.`
`66`	`67`	`break;`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`	`}`
	`71`	`+ this._currentTime = finalTime;`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`