Skip to content

Commit 5e997f9

Browse files
thymikeefacebook-github-bot
authored andcommitted
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: #21849 Differential Revision: D10448849 Pulled By: TheSavior fbshipit-source-id: 34fffde97f48c26098c74ee222a56d99071703a6
1 parent dbc864c commit 5e997f9

File tree

6 files changed

+20
-24
lines changed

6 files changed

+20
-24
lines changed

jest/mockComponent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'use strict';
1111

1212
module.exports = (moduleName, instanceMethods) => {
13-
const RealComponent = require.requireActual(moduleName);
13+
const RealComponent = jest.requireActual(moduleName);
1414
const React = require('react');
1515

1616
const SuperClass =

jest/setup.js

+13-17
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@
99

1010
'use strict';
1111

12-
const MockNativeMethods = require.requireActual('./MockNativeMethods');
13-
const mockComponent = require.requireActual('./mockComponent');
12+
const MockNativeMethods = jest.requireActual('./MockNativeMethods');
13+
const mockComponent = jest.requireActual('./mockComponent');
1414

15-
require.requireActual('../Libraries/polyfills/babelHelpers.js');
16-
require.requireActual('../Libraries/polyfills/Object.es7.js');
17-
require.requireActual('../Libraries/polyfills/error-guard');
15+
jest.requireActual('../Libraries/polyfills/babelHelpers.js');
16+
jest.requireActual('../Libraries/polyfills/Object.es7.js');
17+
jest.requireActual('../Libraries/polyfills/error-guard');
1818

1919
global.__DEV__ = true;
2020

21-
global.Promise = require.requireActual('promise');
22-
global.regeneratorRuntime = require.requireActual(
23-
'regenerator-runtime/runtime',
24-
);
21+
global.Promise = jest.requireActual('promise');
22+
global.regeneratorRuntime = jest.requireActual('regenerator-runtime/runtime');
2523

2624
global.requestAnimationFrame = function(callback) {
2725
return setTimeout(callback, 0);
@@ -42,12 +40,12 @@ jest
4240
.mock('TextInput', () => mockComponent('TextInput'))
4341
.mock('Modal', () => mockComponent('Modal'))
4442
.mock('View', () => mockComponent('View', MockNativeMethods))
45-
.mock('RefreshControl', () => require.requireMock('RefreshControlMock'))
46-
.mock('ScrollView', () => require.requireMock('ScrollViewMock'))
43+
.mock('RefreshControl', () => jest.requireMock('RefreshControlMock'))
44+
.mock('ScrollView', () => jest.requireMock('ScrollViewMock'))
4745
.mock('ActivityIndicator', () => mockComponent('ActivityIndicator'))
48-
.mock('ListView', () => require.requireMock('ListViewMock'))
46+
.mock('ListView', () => jest.requireMock('ListViewMock'))
4947
.mock('ListViewDataSource', () => {
50-
const DataSource = require.requireActual('ListViewDataSource');
48+
const DataSource = jest.requireActual('ListViewDataSource');
5149
DataSource.prototype.toJSON = function() {
5250
function ListViewDataSource(dataBlob) {
5351
this.items = 0;
@@ -68,9 +66,7 @@ jest
6866
return DataSource;
6967
})
7068
.mock('AnimatedImplementation', () => {
71-
const AnimatedImplementation = require.requireActual(
72-
'AnimatedImplementation',
73-
);
69+
const AnimatedImplementation = jest.requireActual('AnimatedImplementation');
7470
const oldCreate = AnimatedImplementation.createAnimatedComponent;
7571
AnimatedImplementation.createAnimatedComponent = function(Component) {
7672
const Wrapped = oldCreate(Component);
@@ -80,7 +76,7 @@ jest
8076
return AnimatedImplementation;
8177
})
8278
.mock('ReactNative', () => {
83-
const ReactNative = require.requireActual('ReactNative');
79+
const ReactNative = jest.requireActual('ReactNative');
8480
const NativeMethodsMixin =
8581
ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
8682
.NativeMethodsMixin;

local-cli/core/__fixtures__/android.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* @format
88
*/
99

10-
const fs = require.requireActual('fs');
11-
const path = require.requireActual('path');
10+
const fs = jest.requireActual('fs');
11+
const path = jest.requireActual('path');
1212

1313
const manifest = fs.readFileSync(
1414
path.join(__dirname, './files/AndroidManifest.xml'),

local-cli/core/__fixtures__/dependencies.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @format */
22

3-
const fs = require.requireActual('fs');
3+
const fs = jest.requireActual('fs');
44
const path = require('path');
55
const android = require('./android');
66

local-cli/core/__fixtures__/ios.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** @format */
22

3-
const fs = require.requireActual('fs');
3+
const fs = jest.requireActual('fs');
44
const path = require('path');
55

66
exports.valid = {

local-cli/link/__tests__/ios/writePlist.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jest.mock('fs');
1616
let plistPath = null;
1717
jest.mock('../../ios/getPlistPath', () => () => plistPath);
1818

19-
const {readFileSync} = require.requireActual('fs');
19+
const {readFileSync} = jest.requireActual('fs');
2020
const fs = require('fs');
2121

2222
const xcode = require('xcode');
2323
const writePlist = require('../../ios/writePlist');
2424

25-
const realPath = require.requireActual('path');
25+
const realPath = jest.requireActual('path');
2626
const projectPath = realPath.join(
2727
__dirname,
2828
'../../__fixtures__/project.pbxproj',

0 commit comments

Comments
 (0)