Skip to content

Commit 30e2938

Browse files
authored
[Tests] Reset modules by default (#28254)
## Overview Sets `resetModules: true` in the base Jest config, and deletes all the `jest.resetModule()` calls we don't need.
1 parent 8b5f0c4 commit 30e2938

File tree

198 files changed

+98
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+98
-391
lines changed

packages/react-art/src/__tests__/ReactART-test.js

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,11 @@ import Circle from 'react-art/Circle';
2222
import Rectangle from 'react-art/Rectangle';
2323
import Wedge from 'react-art/Wedge';
2424

25-
// Isolate DOM renderer.
26-
jest.resetModules();
27-
28-
const ReactDOMClient = require('react-dom/client');
29-
const act = require('internal-test-utils').act;
30-
31-
// Isolate test renderer.
32-
jest.resetModules();
33-
const ReactTestRenderer = require('react-test-renderer');
34-
35-
// Isolate the noop renderer
36-
jest.resetModules();
37-
const ReactNoop = require('react-noop-renderer');
38-
const Scheduler = require('scheduler');
39-
25+
let ReactDOMClient;
26+
let act;
27+
let ReactTestRenderer;
28+
let ReactNoop;
29+
let Scheduler;
4030
let Group;
4131
let Shape;
4232
let Surface;
@@ -73,6 +63,21 @@ describe('ReactART', () => {
7363
let container;
7464

7565
beforeEach(() => {
66+
// Isolate DOM renderer.
67+
jest.resetModules();
68+
69+
ReactDOMClient = require('react-dom/client');
70+
act = require('internal-test-utils').act;
71+
72+
// Isolate test renderer.
73+
jest.resetModules();
74+
ReactTestRenderer = require('react-test-renderer');
75+
76+
// Isolate the noop renderer
77+
jest.resetModules();
78+
ReactNoop = require('react-noop-renderer');
79+
Scheduler = require('scheduler');
80+
7681
container = document.createElement('div');
7782
document.body.appendChild(container);
7883

packages/react-client/src/__tests__/ReactFlight-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ let assertLog;
4242

4343
describe('ReactFlight', () => {
4444
beforeEach(() => {
45-
jest.resetModules();
4645
jest.mock('react', () => require('react/react.react-server'));
4746
ReactServer = require('react');
4847
ReactNoopFlightServer = require('react-noop-renderer/flight-server');

packages/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ describe('React hooks DevTools integration', () => {
3434
onCommitFiberUnmount: () => {},
3535
};
3636

37-
jest.resetModules();
38-
3937
React = require('react');
4038
ReactDebugTools = require('react-debug-tools');
4139
ReactTestRenderer = require('react-test-renderer');

packages/react-debug-tools/src/__tests__/ReactHooksInspection-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ let ReactDebugTools;
1515

1616
describe('ReactHooksInspection', () => {
1717
beforeEach(() => {
18-
jest.resetModules();
1918
React = require('react');
2019
ReactDebugTools = require('react-debug-tools');
2120
});

packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ let useMemoCache;
1919

2020
describe('ReactHooksInspectionIntegration', () => {
2121
beforeEach(() => {
22-
jest.resetModules();
2322
React = require('react');
2423
ReactTestRenderer = require('react-test-renderer');
2524
ReactDOM = require('react-dom');

packages/react-devtools-shared/src/__tests__/console-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,6 @@ describe('console', () => {
924924

925925
describe('console error', () => {
926926
beforeEach(() => {
927-
jest.resetModules();
928-
929927
const Console = require('react-devtools-shared/src/backend/console');
930928
patchConsole = Console.patch;
931929
unpatchConsole = Console.unpatch;

packages/react-devtools-shared/src/hooks/__tests__/parseHookNames-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ describe('parseHookNames', () => {
4848
let parseHookNames;
4949

5050
beforeEach(() => {
51-
jest.resetModules();
52-
5351
jest.mock('source-map-support', () => {
5452
console.trace('source-map-support');
5553
});

packages/react-dom/src/__tests__/DOMPropertyOperations-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ describe('DOMPropertyOperations', () => {
2121
let act;
2222

2323
beforeEach(() => {
24-
jest.resetModules();
2524
React = require('react');
2625
ReactDOMClient = require('react-dom/client');
2726
({act} = require('internal-test-utils'));

packages/react-dom/src/__tests__/InvalidEventListeners-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ describe('InvalidEventListeners', () => {
1818
let container;
1919

2020
beforeEach(() => {
21-
jest.resetModules();
2221
React = require('react');
2322
ReactDOMClient = require('react-dom/client');
2423
act = require('internal-test-utils').act;

packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ let container;
4545
// It should probably be rewritten but we're keeping it for some extra coverage.
4646
describe('ReactBrowserEventEmitter', () => {
4747
beforeEach(() => {
48-
jest.resetModules();
4948
LISTENER.mockClear();
5049

5150
React = require('react');

0 commit comments

Comments
 (0)