fix: fakeAsyncTest requestAnimationFrame should pass timestamp as par…

…ameter (#1220) Close #1216
angular · Apr 9, 2019 · 62b8525 · 62b8525
1 parent 32f3a93
commit 62b8525
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/zone-spec/fake-async-test.ts b/lib/zone-spec/fake-async-test.ts
@@ -143,7 +143,8 @@ class Scheduler {
         if (doTick) {
           doTick(this._currentTime - lastCurrentTime);
         }
-        let retval = current.func.apply(global, current.args);
+        let retval = current.func.apply(
+            global, current.isRequestAnimationFrame ? [this._currentTime] : current.args);
         if (!retval) {
           // Uncaught exception in the current scheduled function. Stop processing the queue.
           break;

diff --git a/test/zone-spec/fake-async-test.spec.ts b/test/zone-spec/fake-async-test.spec.ts
@@ -741,6 +741,24 @@ describe('FakeAsyncTestZoneSpec', () => {
                      expect(ran).toEqual(true);
                    });
                  });
+                 it('should pass timestamp as parameter', () => {
+                   let timestamp = 0;
+                   let timestamp1 = 0;
+                   fakeAsyncTestZone.run(() => {
+                     requestAnimationFrame((ts) => {
+                       timestamp = ts;
+                       requestAnimationFrame(ts1 => {
+                         timestamp1 = ts1;
+                       });
+                     });
+                     const elapsed = testZoneSpec.flush(20, true);
+                     const elapsed1 = testZoneSpec.flush(20, true);
+                     expect(elapsed).toEqual(16);
+                     expect(elapsed1).toEqual(16);
+                     expect(timestamp).toEqual(16);
+                     expect(timestamp1).toEqual(32);
+                   });
+                 });
                }));
     });
   });