From 5e997f9d51770224cbb6bf938739b56e1a7fa3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Thu, 18 Oct 2018 15:24:15 -0700 Subject: [PATCH] use requireActual and requireMock from jest instead of require (#21849) Summary: A while back Jest introduced `jest.requireActual` and `jest.requireMock` which are aliases to `require.requireActual` and `require.requireMock`. We believe that users should use official Jest API and are planning to deprecate the latter. Pull Request resolved: https://github.com/facebook/react-native/pull/21849 Differential Revision: D10448849 Pulled By: TheSavior fbshipit-source-id: 34fffde97f48c26098c74ee222a56d99071703a6 --- jest/mockComponent.js | 2 +- jest/setup.js | 30 ++++++++----------- local-cli/core/__fixtures__/android.js | 4 +-- local-cli/core/__fixtures__/dependencies.js | 2 +- local-cli/core/__fixtures__/ios.js | 2 +- .../link/__tests__/ios/writePlist.spec.js | 4 +-- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/jest/mockComponent.js b/jest/mockComponent.js index b8921b1ce4ad28..28e222123961ba 100644 --- a/jest/mockComponent.js +++ b/jest/mockComponent.js @@ -10,7 +10,7 @@ 'use strict'; module.exports = (moduleName, instanceMethods) => { - const RealComponent = require.requireActual(moduleName); + const RealComponent = jest.requireActual(moduleName); const React = require('react'); const SuperClass = diff --git a/jest/setup.js b/jest/setup.js index 1e3cef41425690..f58eebe9965a8f 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -9,19 +9,17 @@ 'use strict'; -const MockNativeMethods = require.requireActual('./MockNativeMethods'); -const mockComponent = require.requireActual('./mockComponent'); +const MockNativeMethods = jest.requireActual('./MockNativeMethods'); +const mockComponent = jest.requireActual('./mockComponent'); -require.requireActual('../Libraries/polyfills/babelHelpers.js'); -require.requireActual('../Libraries/polyfills/Object.es7.js'); -require.requireActual('../Libraries/polyfills/error-guard'); +jest.requireActual('../Libraries/polyfills/babelHelpers.js'); +jest.requireActual('../Libraries/polyfills/Object.es7.js'); +jest.requireActual('../Libraries/polyfills/error-guard'); global.__DEV__ = true; -global.Promise = require.requireActual('promise'); -global.regeneratorRuntime = require.requireActual( - 'regenerator-runtime/runtime', -); +global.Promise = jest.requireActual('promise'); +global.regeneratorRuntime = jest.requireActual('regenerator-runtime/runtime'); global.requestAnimationFrame = function(callback) { return setTimeout(callback, 0); @@ -42,12 +40,12 @@ jest .mock('TextInput', () => mockComponent('TextInput')) .mock('Modal', () => mockComponent('Modal')) .mock('View', () => mockComponent('View', MockNativeMethods)) - .mock('RefreshControl', () => require.requireMock('RefreshControlMock')) - .mock('ScrollView', () => require.requireMock('ScrollViewMock')) + .mock('RefreshControl', () => jest.requireMock('RefreshControlMock')) + .mock('ScrollView', () => jest.requireMock('ScrollViewMock')) .mock('ActivityIndicator', () => mockComponent('ActivityIndicator')) - .mock('ListView', () => require.requireMock('ListViewMock')) + .mock('ListView', () => jest.requireMock('ListViewMock')) .mock('ListViewDataSource', () => { - const DataSource = require.requireActual('ListViewDataSource'); + const DataSource = jest.requireActual('ListViewDataSource'); DataSource.prototype.toJSON = function() { function ListViewDataSource(dataBlob) { this.items = 0; @@ -68,9 +66,7 @@ jest return DataSource; }) .mock('AnimatedImplementation', () => { - const AnimatedImplementation = require.requireActual( - 'AnimatedImplementation', - ); + const AnimatedImplementation = jest.requireActual('AnimatedImplementation'); const oldCreate = AnimatedImplementation.createAnimatedComponent; AnimatedImplementation.createAnimatedComponent = function(Component) { const Wrapped = oldCreate(Component); @@ -80,7 +76,7 @@ jest return AnimatedImplementation; }) .mock('ReactNative', () => { - const ReactNative = require.requireActual('ReactNative'); + const ReactNative = jest.requireActual('ReactNative'); const NativeMethodsMixin = ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED .NativeMethodsMixin; diff --git a/local-cli/core/__fixtures__/android.js b/local-cli/core/__fixtures__/android.js index 07e1ee27948ce5..d5f603069fc446 100644 --- a/local-cli/core/__fixtures__/android.js +++ b/local-cli/core/__fixtures__/android.js @@ -7,8 +7,8 @@ * @format */ -const fs = require.requireActual('fs'); -const path = require.requireActual('path'); +const fs = jest.requireActual('fs'); +const path = jest.requireActual('path'); const manifest = fs.readFileSync( path.join(__dirname, './files/AndroidManifest.xml'), diff --git a/local-cli/core/__fixtures__/dependencies.js b/local-cli/core/__fixtures__/dependencies.js index decb08a161c228..3b9c9abc3f9727 100644 --- a/local-cli/core/__fixtures__/dependencies.js +++ b/local-cli/core/__fixtures__/dependencies.js @@ -1,6 +1,6 @@ /** @format */ -const fs = require.requireActual('fs'); +const fs = jest.requireActual('fs'); const path = require('path'); const android = require('./android'); diff --git a/local-cli/core/__fixtures__/ios.js b/local-cli/core/__fixtures__/ios.js index 99e84080fbacbb..ef0ba538af675a 100644 --- a/local-cli/core/__fixtures__/ios.js +++ b/local-cli/core/__fixtures__/ios.js @@ -1,6 +1,6 @@ /** @format */ -const fs = require.requireActual('fs'); +const fs = jest.requireActual('fs'); const path = require('path'); exports.valid = { diff --git a/local-cli/link/__tests__/ios/writePlist.spec.js b/local-cli/link/__tests__/ios/writePlist.spec.js index 7bb3fee516f8a3..6c11361749c8fb 100644 --- a/local-cli/link/__tests__/ios/writePlist.spec.js +++ b/local-cli/link/__tests__/ios/writePlist.spec.js @@ -16,13 +16,13 @@ jest.mock('fs'); let plistPath = null; jest.mock('../../ios/getPlistPath', () => () => plistPath); -const {readFileSync} = require.requireActual('fs'); +const {readFileSync} = jest.requireActual('fs'); const fs = require('fs'); const xcode = require('xcode'); const writePlist = require('../../ios/writePlist'); -const realPath = require.requireActual('path'); +const realPath = jest.requireActual('path'); const projectPath = realPath.join( __dirname, '../../__fixtures__/project.pbxproj',