BROKEN Upgrade to Jest 28

facebook · Sep 10, 2022 · 0e3a9e4 · 0e3a9e4
1 parent 8803f53
commit 0e3a9e4
Show file tree

Hide file tree

Showing 15 changed files with 984 additions and 604 deletions.
diff --git a/package.json b/package.json
@@ -69,9 +69,11 @@
     "google-closure-compiler": "^20200517.0.0",
     "gzip-size": "^5.1.1",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "^27.5.1",
-    "jest-cli": "^27.5.1",
-    "jest-diff": "^27.5.1",
+    "jest": "^28.1.3",
+    "jest-cli": "^28.1.3",
+    "jest-diff": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
+    "jest-jasmine2": "^28.1.3",
     "jest-snapshot-serializer-raw": "^1.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.3",
@@ -149,5 +151,8 @@
   },
   "resolutions": {
     "react-is": "npm:react-is"
+  },
+  "volta": {
+    "node": "16.17.0"
   }
 }
diff --git a/packages/jest-mock-scheduler/package.json b/packages/jest-mock-scheduler/package.json
@@ -19,7 +19,7 @@
   },
   "homepage": "https://reactjs.org/",
   "peerDependencies": {
-    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.0.0 || ^27.0.1",
+    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.0.0 || ^27.0.1 || ^28.0.0",
     "scheduler": "^0.20.0"
   },
   "files": [

diff --git a/packages/jest-react/package.json b/packages/jest-react/package.json
@@ -19,7 +19,7 @@
   },
   "homepage": "https://reactjs.org/",
   "peerDependencies": {
-    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.0.0 || ^27.0.1",
+    "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.0.0 || ^27.0.1 || ^28.0.0",
     "react": "^18.2.0",
     "react-test-renderer": "^18.2.0"
   },

diff --git a/packages/jest-react/src/internalAct.js b/packages/jest-react/src/internalAct.js
@@ -33,7 +33,7 @@ export function act<T>(scope: () => Thenable<T> | T): Thenable<T> {
   if (setTimeout._isMockFunction !== true) {
     throw Error(
       "This version of `act` requires Jest's timer mocks " +
-        "(i.e. jest.useFakeTimers('legacy')).",
+        '(i.e. jest.useFakeTimers({legacyFakeTimers: true})).',
     );
   }
 

diff --git a/packages/react-devtools-shared/src/__tests__/setupTests.js b/packages/react-devtools-shared/src/__tests__/setupTests.js
@@ -56,7 +56,7 @@ env.beforeEach(() => {
   } = require('react-devtools-shared/src/utils');
 
   // Fake timers let us flush Bridge operations between setup and assertions.
-  jest.useFakeTimers('legacy');
+  jest.useFakeTimers({legacyFakeTimers: true});
 
   // Use utils.js#withErrorsOrWarningsIgnored instead of directly mutating this array.
   global._ignoredErrorOrWarningMessages = [];

diff --git a/packages/react-dom/src/__tests__/ReactErrorBoundaries-test.internal.js b/packages/react-dom/src/__tests__/ReactErrorBoundaries-test.internal.js
@@ -37,7 +37,7 @@ describe('ReactErrorBoundaries', () => {
   let Normal;
 
   beforeEach(() => {
-    jest.useFakeTimers('legacy');
+    jest.useFakeTimers({legacyFakeTimers: true});
     jest.resetModules();
     PropTypes = require('prop-types');
     ReactFeatureFlags = require('shared/ReactFeatureFlags');

diff --git a/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js b/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js
@@ -302,7 +302,7 @@ function runActTests(label, render, unmount, rerender) {
 
       describe('fake timers', () => {
         beforeEach(() => {
-          jest.useFakeTimers('legacy');
+          jest.useFakeTimers({legacyFakeTimers: true});
         });
 
         afterEach(() => {

diff --git a/packages/react-reconciler/src/__tests__/ReactEffectOrdering-test.js b/packages/react-reconciler/src/__tests__/ReactEffectOrdering-test.js
@@ -22,7 +22,7 @@ let useLayoutEffect;
 describe('ReactHooksWithNoopRenderer', () => {
   beforeEach(() => {
     jest.resetModules();
-    jest.useFakeTimers('legacy');
+    jest.useFakeTimers({legacyFakeTimers: true});
 
     React = require('react');
     ReactNoop = require('react-noop-renderer');

diff --git a/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js b/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js
@@ -39,7 +39,7 @@ let SuspenseList;
 describe('ReactHooksWithNoopRenderer', () => {
   beforeEach(() => {
     jest.resetModules();
-    jest.useFakeTimers('legacy');
+    jest.useFakeTimers({legacyFakeTimers: true});
 
     React = require('react');
     ReactNoop = require('react-noop-renderer');

diff --git a/packages/react-reconciler/src/__tests__/useMutableSource-test.internal.js b/packages/react-reconciler/src/__tests__/useMutableSource-test.internal.js
@@ -22,7 +22,7 @@ let useMutableSource;
 
 function loadModules() {
   jest.resetModules();
-  jest.useFakeTimers('legacy');
+  jest.useFakeTimers({legacyFakeTimers: true});
 
   ReactFeatureFlags = require('shared/ReactFeatureFlags');
   ReactFeatureFlags.enableProfilerTimer = true;

diff --git a/packages/react-reconciler/src/__tests__/useRef-test.internal.js b/packages/react-reconciler/src/__tests__/useRef-test.internal.js
@@ -45,7 +45,7 @@ describe('useRef', () => {
   }
 
   it('creates a ref object initialized with the provided value', () => {
-    jest.useFakeTimers('legacy');
+    jest.useFakeTimers({legacyFakeTimers: true});
 
     function useDebouncedCallback(callback, ms, inputs) {
       const timeoutID = useRef(-1);

diff --git a/packages/scheduler/src/__tests__/SchedulerSetTimeout-test.js b/packages/scheduler/src/__tests__/SchedulerSetTimeout-test.js
@@ -21,7 +21,7 @@ describe('SchedulerNoDOM', () => {
   // This is only meant to be used for testing purposes, like with jest's fake timer API.
   beforeEach(() => {
     jest.resetModules();
-    jest.useFakeTimers('legacy');
+    jest.useFakeTimers({legacyFakeTimers: true});
     delete global.setImmediate;
     jest.unmock('scheduler');
 

diff --git a/scripts/jest/config.base.js b/scripts/jest/config.base.js
@@ -21,7 +21,10 @@ module.exports = {
   roots: ['<rootDir>/packages', '<rootDir>/scripts'],
   collectCoverageFrom: ['packages/**/*.js'],
   // TODO: Use the default `modern` implementation (includes `jest.useFakeTimers()`)
-  timers: 'legacy',
+  fakeTimers: {
+    enableGlobally: true,
+    legacyFakeTimers: true,
+  },
   snapshotSerializers: [require.resolve('jest-snapshot-serializer-raw')],
 
   testSequencer: require.resolve('./jestSequencer'),

diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js
@@ -57,16 +57,16 @@ module.exports = {
   process: function(src, filePath) {
     if (filePath.match(/\.css$/)) {
       // Don't try to parse CSS modules; they aren't needed for tests anyway.
-      return '';
+      return {code: ''};
     }
     if (filePath.match(/\.coffee$/)) {
-      return coffee.compile(src, {bare: true});
+      return {code: coffee.compile(src, {bare: true})};
     }
     if (filePath.match(/\.ts$/) && !filePath.match(/\.d\.ts$/)) {
-      return tsPreprocessor.compile(src, filePath);
+      return {code: tsPreprocessor.compile(src, filePath)};
     }
     if (filePath.match(/\.json$/)) {
-      return src;
+      return {code: src};
     }
     if (!filePath.match(/\/third_party\//)) {
       // for test files, we also apply the async-await transform, but we want to
@@ -100,7 +100,7 @@ module.exports = {
         )
       );
     }
-    return src;
+    return {code: src};
   },
 
   getCacheKey: createCacheKeyFunction([