Skip to content

Commit c3cf99b

Browse files
eps1lonkoto
authored andcommitted
Update jest to v26 (facebook#21574)
* Install jest 26 * jsdom env now uses 16 by default * require.requireActual -> jest.requireActual * deduplicate added deps
1 parent cdd0ab2 commit c3cf99b

File tree

9 files changed

+906
-859
lines changed

9 files changed

+906
-859
lines changed

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@
6868
"google-closure-compiler": "^20200517.0.0",
6969
"gzip-size": "^5.1.1",
7070
"jasmine-check": "^1.0.0-rc.0",
71-
"jest": "^25.2.7",
72-
"jest-cli": "^25.2.7",
73-
"jest-diff": "^25.2.6",
74-
"jest-environment-jsdom-sixteen": "^1.0.3",
71+
"jest": "^26.6.3",
72+
"jest-cli": "^26.6.3",
73+
"jest-diff": "^26.6.2",
7574
"jest-snapshot-serializer-raw": "^1.1.0",
7675
"minimatch": "^3.0.4",
7776
"minimist": "^1.2.3",

packages/react-reconciler/src/__tests__/ReactSchedulerIntegration-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ describe(
187187
jest.resetModules();
188188

189189
jest.mock('scheduler', () => {
190-
const actual = require.requireActual('scheduler/unstable_mock');
190+
const actual = jest.requireActual('scheduler/unstable_mock');
191191
return {
192192
...actual,
193193
unstable_shouldYield() {
@@ -207,7 +207,7 @@ describe(
207207

208208
afterEach(() => {
209209
jest.mock('scheduler', () =>
210-
require.requireActual('scheduler/unstable_mock'),
210+
jest.requireActual('scheduler/unstable_mock'),
211211
);
212212
});
213213

packages/react/src/__tests__/ReactProfiler-test.internal.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ describe(`onRender`, () => {
229229
// Mock the Scheduler module so we can track how many times the current
230230
// time is read
231231
jest.mock('scheduler', obj => {
232-
const ActualScheduler = require.requireActual('scheduler/unstable_mock');
232+
const ActualScheduler = jest.requireActual('scheduler/unstable_mock');
233233
return {
234234
...ActualScheduler,
235235
unstable_now: function mockUnstableNow() {
@@ -267,9 +267,7 @@ describe(`onRender`, () => {
267267
]);
268268

269269
// Restore original mock
270-
jest.mock('scheduler', () =>
271-
require.requireActual('scheduler/unstable_mock'),
272-
);
270+
jest.mock('scheduler', () => jest.requireActual('scheduler/unstable_mock'));
273271
});
274272

275273
it('does not report work done on a sibling', () => {

packages/scheduler/src/__tests__/SchedulerPostTask-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('SchedulerPostTask', () => {
3131
beforeEach(() => {
3232
jest.resetModules();
3333
jest.mock('scheduler', () =>
34-
require.requireActual('scheduler/unstable_post_task'),
34+
jest.requireActual('scheduler/unstable_post_task'),
3535
);
3636

3737
runtime = installMockBrowserRuntime();

scripts/jest/config.base.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ module.exports = {
2525

2626
testSequencer: require.resolve('./jestSequencer'),
2727

28-
// TODO: Upgrade to Jest 26 which uses jsdom 16 by default.
29-
testEnvironment: require.resolve('jest-environment-jsdom-sixteen'),
28+
testEnvironment: 'jsdom',
3029
};

scripts/jest/setupHostConfigs.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const inlinedHostConfigs = require('../shared/inlinedHostConfigs');
44

55
jest.mock('react-reconciler/src/ReactFiberReconciler', () => {
6-
return require.requireActual(
6+
return jest.requireActual(
77
__VARIANT__
88
? 'react-reconciler/src/ReactFiberReconciler.new'
99
: 'react-reconciler/src/ReactFiberReconciler.old'
@@ -16,7 +16,7 @@ const shimHostConfigPath = 'react-reconciler/src/ReactFiberHostConfig';
1616
jest.mock('react-reconciler', () => {
1717
return config => {
1818
jest.mock(shimHostConfigPath, () => config);
19-
return require.requireActual('react-reconciler');
19+
return jest.requireActual('react-reconciler');
2020
};
2121
});
2222
const shimServerStreamConfigPath = 'react-server/src/ReactServerStreamConfig';
@@ -26,7 +26,7 @@ jest.mock('react-server', () => {
2626
return config => {
2727
jest.mock(shimServerStreamConfigPath, () => config);
2828
jest.mock(shimServerFormatConfigPath, () => config);
29-
return require.requireActual('react-server');
29+
return jest.requireActual('react-server');
3030
};
3131
});
3232
jest.mock('react-server/flight', () => {
@@ -39,19 +39,19 @@ jest.mock('react-server/flight', () => {
3939
resolveModuleMetaData: config.resolveModuleMetaData,
4040
}));
4141
jest.mock(shimFlightServerConfigPath, () =>
42-
require.requireActual(
42+
jest.requireActual(
4343
'react-server/src/forks/ReactFlightServerConfig.custom'
4444
)
4545
);
46-
return require.requireActual('react-server/flight');
46+
return jest.requireActual('react-server/flight');
4747
};
4848
});
4949
const shimFlightClientHostConfigPath =
5050
'react-client/src/ReactFlightClientHostConfig';
5151
jest.mock('react-client/flight', () => {
5252
return config => {
5353
jest.mock(shimFlightClientHostConfigPath, () => config);
54-
return require.requireActual('react-client/flight');
54+
return jest.requireActual('react-client/flight');
5555
};
5656
});
5757

@@ -69,7 +69,7 @@ function mockAllConfigs(rendererInfo) {
6969
jest.mock(path, () => {
7070
let idx = path.lastIndexOf('/');
7171
let forkPath = path.substr(0, idx) + '/forks' + path.substr(idx);
72-
return require.requireActual(`${forkPath}.${rendererInfo.shortName}.js`);
72+
return jest.requireActual(`${forkPath}.${rendererInfo.shortName}.js`);
7373
});
7474
});
7575
}
@@ -85,15 +85,15 @@ inlinedHostConfigs.forEach(rendererInfo => {
8585
rendererInfo.entryPoints.forEach(entryPoint => {
8686
jest.mock(entryPoint, () => {
8787
mockAllConfigs(rendererInfo);
88-
return require.requireActual(entryPoint);
88+
return jest.requireActual(entryPoint);
8989
});
9090
});
9191
});
9292

9393
// Make it possible to import this module inside
9494
// the React package itself.
9595
jest.mock('shared/ReactSharedInternals', () =>
96-
require.requireActual('react/src/ReactSharedInternals')
96+
jest.requireActual('react/src/ReactSharedInternals')
9797
);
9898

99-
jest.mock('scheduler', () => require.requireActual('scheduler/unstable_mock'));
99+
jest.mock('scheduler', () => jest.requireActual('scheduler/unstable_mock'));

scripts/jest/setupTests.build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
'use strict';
22

3-
jest.mock('scheduler', () => require.requireActual('scheduler/unstable_mock'));
3+
jest.mock('scheduler', () => jest.requireActual('scheduler/unstable_mock'));

scripts/jest/setupTests.persistent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
jest.mock('react-noop-renderer', () =>
4-
require.requireActual('react-noop-renderer/persistent')
4+
jest.requireActual('react-noop-renderer/persistent')
55
);
66

77
global.__PERSISTENT__ = true;

0 commit comments

Comments
 (0)