Call with timestamp

jestjs · Jun 14, 2021 · aa748d1 · aa748d1
1 parent 26dc18c
commit aa748d1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/e2e/fake-time/legacy/requestAnimationFrame/__tests__/test.js b/e2e/fake-time/legacy/requestAnimationFrame/__tests__/test.js
@@ -11,16 +11,16 @@
 
 test('requestAnimationFrame', () => {
   jest.useFakeTimers('legacy');
-  let exited = false;
-  requestAnimationFrame(() => {
-    exited = true;
+  let frameTimestamp = -1;
+  requestAnimationFrame(timestamp => {
+    frameTimestamp = timestamp;
   });
 
   jest.advanceTimersByTime(15);
 
-  expect(exited).toBe(false);
+  expect(frameTimestamp).toBe(-1);
 
   jest.advanceTimersByTime(1);
 
-  expect(exited).toBe(true);
+  expect(frameTimestamp).toBeGreaterThan(15);
 });
diff --git a/e2e/fake-time/modern/requestAnimationFrame/__tests__/test.js b/e2e/fake-time/modern/requestAnimationFrame/__tests__/test.js
@@ -10,17 +10,17 @@
 'use strict';
 
 test('requestAnimationFrame', () => {
-  jest.useFakeTimers('legacy');
-  let exited = false;
-  requestAnimationFrame(() => {
-    exited = true;
+  jest.useFakeTimers('modern');
+  let frameTimestamp = -1;
+  requestAnimationFrame(timestamp => {
+    frameTimestamp = timestamp;
   });
 
   jest.advanceTimersByTime(15);
 
-  expect(exited).toBe(false);
+  expect(frameTimestamp).toBe(-1);
 
   jest.advanceTimersByTime(1);
 
-  expect(exited).toBe(true);
+  expect(frameTimestamp).toBeGreaterThan(15);
 });
diff --git a/packages/jest-fake-timers/src/__tests__/legacyFakeTimers.test.ts b/packages/jest-fake-timers/src/__tests__/legacyFakeTimers.test.ts
@@ -667,12 +667,14 @@ describe('FakeTimers', () => {
       });
       timers.useFakeTimers();
 
-      const runOrder: Array<string> = [];
+      const runOrder: Array<string | ['animationFrame', number]> = [];
       const mock1 = jest.fn(() => runOrder.push('mock1'));
       const mock2 = jest.fn(() => runOrder.push('mock2'));
       const mock3 = jest.fn(() => runOrder.push('mock3'));
       const mock4 = jest.fn(() => runOrder.push('mock4'));
-      const mockAnimationFrame = jest.fn(() => runOrder.push('animationFrame'));
+      const mockAnimationFrame = jest.fn(timestamp =>
+        runOrder.push(['animationFrame', timestamp]),
+      );
 
       global.setTimeout(mock1, 100);
       global.setTimeout(mock2, 0);
@@ -686,24 +688,29 @@ describe('FakeTimers', () => {
       timers.advanceTimersByTime(15);
       expect(runOrder).toEqual(['mock2', 'mock3']);
 
-      // Move forward to t=17
-      timers.advanceTimersByTime(2);
-      expect(runOrder).toEqual(['mock2', 'mock3', 'animationFrame']);
+      // Move forward to t=16
+      timers.advanceTimersByTime(1);
+      expect(runOrder).toEqual(['mock2', 'mock3', ['animationFrame', 16]]);
 
       // Move forward to t=60
-      timers.advanceTimersByTime(43);
-      expect(runOrder).toEqual(['mock2', 'mock3', 'animationFrame']);
+      timers.advanceTimersByTime(44);
+      expect(runOrder).toEqual(['mock2', 'mock3', ['animationFrame', 16]]);
 
       // Move forward to t=100
       timers.advanceTimersByTime(40);
-      expect(runOrder).toEqual(['mock2', 'mock3', 'animationFrame', 'mock1']);
+      expect(runOrder).toEqual([
+        'mock2',
+        'mock3',
+        ['animationFrame', 16],
+        'mock1',
+      ]);
 
       // Move forward to t=200
       timers.advanceTimersByTime(100);
       expect(runOrder).toEqual([
         'mock2',
         'mock3',
-        'animationFrame',
+        ['animationFrame', 16],
         'mock1',
         'mock4',
       ]);
@@ -713,7 +720,7 @@ describe('FakeTimers', () => {
       expect(runOrder).toEqual([
         'mock2',
         'mock3',
-        'animationFrame',
+        ['animationFrame', 16],
         'mock1',
         'mock4',
         'mock4',

diff --git a/packages/jest-fake-timers/src/legacyFakeTimers.ts b/packages/jest-fake-timers/src/legacyFakeTimers.ts
@@ -471,7 +471,10 @@ export default class FakeTimers<TimerRef> {
   }
 
   private _fakeRequestAnimationFrame(callback: Callback) {
-    return this._fakeSetTimeout(callback, 1000 / 60);
+    return this._fakeSetTimeout(() => {
+      // TODO: Use performance.now() once it's mocked
+      callback(this._now);
+    }, 1000 / 60);
   }
 
   private _fakeSetImmediate(callback: Callback, ...args: Array<any>) {