Skip to content

Commit 4bc8e45

Browse files
authored
Revert "[Tests] Reset modules by default (#28254)"
This reverts commit 30e2938.
1 parent 14fd963 commit 4bc8e45

File tree

198 files changed

+391
-98
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

+391
-98
lines changed

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

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

25-
let ReactDOMClient;
26-
let act;
27-
let ReactTestRenderer;
28-
let ReactNoop;
29-
let Scheduler;
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+
3040
let Group;
3141
let Shape;
3242
let Surface;
@@ -63,21 +73,6 @@ describe('ReactART', () => {
6373
let container;
6474

6575
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-
8176
container = document.createElement('div');
8277
document.body.appendChild(container);
8378

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

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

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

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

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

37+
jest.resetModules();
38+
3739
React = require('react');
3840
ReactDebugTools = require('react-debug-tools');
3941
ReactTestRenderer = require('react-test-renderer');

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

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

1616
describe('ReactHooksInspection', () => {
1717
beforeEach(() => {
18+
jest.resetModules();
1819
React = require('react');
1920
ReactDebugTools = require('react-debug-tools');
2021
});

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

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

2020
describe('ReactHooksInspectionIntegration', () => {
2121
beforeEach(() => {
22+
jest.resetModules();
2223
React = require('react');
2324
ReactTestRenderer = require('react-test-renderer');
2425
ReactDOM = require('react-dom');

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

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

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

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

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

5050
beforeEach(() => {
51+
jest.resetModules();
52+
5153
jest.mock('source-map-support', () => {
5254
console.trace('source-map-support');
5355
});

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

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

2323
beforeEach(() => {
24+
jest.resetModules();
2425
React = require('react');
2526
ReactDOMClient = require('react-dom/client');
2627
({act} = require('internal-test-utils'));

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

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

2020
beforeEach(() => {
21+
jest.resetModules();
2122
React = require('react');
2223
ReactDOMClient = require('react-dom/client');
2324
act = require('internal-test-utils').act;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ 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();
4849
LISTENER.mockClear();
4950

5051
React = require('react');

0 commit comments

Comments
 (0)