From 8ae4c3fcfdf7008b759f00f0dc611f32c7549c81 Mon Sep 17 00:00:00 2001 From: Emily Janzer Date: Thu, 4 May 2017 17:29:09 -0700 Subject: [PATCH] Add request/cancelAnimationFrame to jest setup Reviewed By: cpojer Differential Revision: D5005587 fbshipit-source-id: 653c281df9025a75ed8eecd22a2e64eaf188bf3e --- Libraries/Animated/src/__tests__/Animated-test.js | 5 ----- Libraries/Animated/src/__tests__/AnimatedNative-test.js | 5 ----- jest/setup.js | 7 +++++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js index c081f1e9b..38b2c4248 100644 --- a/Libraries/Animated/src/__tests__/Animated-test.js +++ b/Libraries/Animated/src/__tests__/Animated-test.js @@ -111,11 +111,6 @@ describe('Animated tests', () => { it('stops animation when detached', () => { - // jest environment doesn't have cancelAnimationFrame :( - if (!global.cancelAnimationFrame) { - global.cancelAnimationFrame = jest.fn(); - } - var anim = new Animated.Value(0); var callback = jest.fn(); diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js index 1d46f6474..de204c79b 100644 --- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js +++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js @@ -55,11 +55,6 @@ describe('Native Animated', () => { nativeAnimatedModule.startListeningToAnimatedNodeValue = jest.fn(); nativeAnimatedModule.stopAnimation = jest.fn(); nativeAnimatedModule.stopListeningToAnimatedNodeValue = jest.fn(); - - // jest environment doesn't have cancelAnimationFrame :( - if (!global.cancelAnimationFrame) { - global.cancelAnimationFrame = jest.fn(); - } }); describe('Animated Value', () => { diff --git a/jest/setup.js b/jest/setup.js index e2cae1f05..d36a83c58 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -19,6 +19,13 @@ global.__DEV__ = true; global.Promise = require.requireActual('promise'); global.regeneratorRuntime = require.requireActual('regenerator-runtime/runtime'); +global.requestAnimationFrame = function(callback) { + setTimeout(callback, 0); +}; +global.cancelAnimationFrame = function(id) { + clearTimeout(id); +}; + jest .mock('setupDevtools') .mock('npmlog');