Include time since window initialised in rAF implementation

jestjs · Sep 30, 2017 · 4968028 · 4968028
1 parent b3f85a2
commit 4968028
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/integration_tests/request_animation_frame/__tests__/request_animation_frame.test.js b/integration_tests/request_animation_frame/__tests__/request_animation_frame.test.js
@@ -12,8 +12,9 @@
 test('requestAnimationFrame test', done => {
   expect.hasAssertions();
 
-  requestAnimationFrame(() => {
+  requestAnimationFrame(timestamp => {
     expect(true).toBe(true);
+    expect(timestamp).toBeGreaterThan(0);
 
     done();
   });

diff --git a/packages/jest-environment-jsdom/src/index.js b/packages/jest-environment-jsdom/src/index.js
@@ -22,6 +22,7 @@ class JSDOMEnvironment {
   moduleMocker: ?ModuleMocker;
 
   constructor(config: ProjectConfig): void {
+    const jsdomInitialized = process.hrtime();
     // lazy require
     this.document = JSDom.jsdom('<!DOCTYPE html>', {
       url: config.testURL,
@@ -34,7 +35,11 @@ class JSDOMEnvironment {
 
     if (!global.requestAnimationFrame) {
       global.requestAnimationFrame = callback => {
-        global.setTimeout(callback, 0);
+        const hr = process.hrtime(jsdomInitialized);
+        const hrInNano = hr[0] * 1e9 + hr[1];
+        const hrInMicro = hrInNano / 1e6;
+
+        return global.setTimeout(callback, 0, hrInMicro);
       };
     }