Remove remaining usages of ReactTestUtils in tests unrelated to `react-dom/test-util` (#28534)
Batched the remaining usages since these were straight forward. Completes removal of `ReactTestUtils` from tests unrelated to `react-dom/test-util` together with: - https://github.com/facebook/react/pull/28531 - https://github.com/facebook/react/pull/28532 - https://github.com/facebook/react/pull/28533
Sebastian Silbermann committed
Mar 11, 2024 at 13:27 UTC
dfaed5582550f11b27aae967a8e7084202dd2d90
5 files changed
+24
-14
packages/react-devtools-shared/src/__tests__/profilingCache-test.js
+5
-3
@@ -1237,12 +1237,14 @@ describe('ProfilingCache', () => {
1237
);
1238
}
1239
1240
- const {Simulate} = require('react-dom/test-utils');
1241
-
1240
utils.act(() => render(<App />));
1241
expect(getContainer().textContent).toBe('Home');
1242
utils.act(() => store.profilerStore.startProfiling());
1245
- utils.act(() => Simulate.click(linkRef.current));
1243
+ utils.act(() =>
1244
+ linkRef.current.dispatchEvent(
1245
+ new MouseEvent('click', {bubbles: true, cancelable: true}),
1246
+ ),
1247
+ );
1248
utils.act(() => store.profilerStore.stopProfiling());
1249
expect(getContainer().textContent).toBe('About');
1250
});
packages/react-dom/src/__tests__/ReactLegacyMount-test.js
+4
-3
@@ -14,7 +14,6 @@ const {COMMENT_NODE} = require('react-dom-bindings/src/client/HTMLNodeType');
14
let React;
15
let ReactDOM;
16
let ReactDOMServer;
17
-let ReactTestUtils;
17
let Scheduler;
18
let ReactDOMClient;
19
let assertLog;
@@ -28,7 +27,6 @@ describe('ReactMount', () => {
27
ReactDOM = require('react-dom');
28
ReactDOMClient = require('react-dom/client');
29
ReactDOMServer = require('react-dom/server');
31
- ReactTestUtils = require('react-dom/test-utils');
30
Scheduler = require('scheduler');
31
32
const InternalTestUtils = require('internal-test-utils');
@@ -71,7 +69,10 @@ describe('ReactMount', () => {
69
}
70
}
71
74
- expect(() => ReactTestUtils.renderIntoDocument(Component)).toErrorDev(
72
+ expect(() => {
73
+ const container = document.createElement('div');
74
+ ReactDOM.render(Component, container);
75
+ }).toErrorDev(
76
'Functions are not valid as a React child. ' +
77
'This may happen if you return Component instead of <Component /> from render. ' +
78
'Or maybe you meant to call this function rather than return it.\n' +
packages/react-dom/src/__tests__/findDOMNode-test.js
+13
-5
@@ -11,7 +11,6 @@
11
12
const React = require('react');
13
const ReactDOM = require('react-dom');
14
-const ReactTestUtils = require('react-dom/test-utils');
14
const StrictMode = React.StrictMode;
15
16
describe('findDOMNode', () => {
@@ -31,7 +30,8 @@ describe('findDOMNode', () => {
30
}
31
}
32
34
- const myNode = ReactTestUtils.renderIntoDocument(<MyNode />);
33
+ const container = document.createElement('div');
34
+ const myNode = ReactDOM.render(<MyNode />, container);
35
const myDiv = ReactDOM.findDOMNode(myNode);
36
const mySameDiv = ReactDOM.findDOMNode(myDiv);
37
expect(myDiv.tagName).toBe('DIV');
@@ -99,7 +99,10 @@ describe('findDOMNode', () => {
99
return <div />;
100
}
101
}
102
- expect(() => ReactTestUtils.renderIntoDocument(<Bar />)).not.toThrow();
102
+ expect(() => {
103
+ const container = document.createElement('div');
104
+ ReactDOM.render(<Bar />, container);
105
+ }).not.toThrow();
106
});
107
108
// @gate !disableLegacyMode
@@ -117,8 +120,10 @@ describe('findDOMNode', () => {
120
}
121
}
122
120
- ReactTestUtils.renderIntoDocument(
123
+ const container = document.createElement('div');
124
+ ReactDOM.render(
125
<ContainsStrictModeChild ref={n => (parent = n)} />,
126
+ container,
127
);
128
129
let match;
@@ -145,10 +150,13 @@ describe('findDOMNode', () => {
150
}
151
}
152
148
- ReactTestUtils.renderIntoDocument(
153
+ const container = document.createElement('div');
154
+
155
+ ReactDOM.render(
156
<StrictMode>
157
<IsInStrictMode ref={n => (parent = n)} />
158
</StrictMode>,
159
+ container,
160
);
161
162
let match;
packages/react-dom/src/__tests__/renderSubtreeIntoContainer-test.js
+2
-2
@@ -13,7 +13,6 @@ const React = require('react');
13
const PropTypes = require('prop-types');
14
const ReactDOM = require('react-dom');
15
const ReactDOMClient = require('react-dom/client');
16
-const ReactTestUtils = require('react-dom/test-utils');
16
const act = require('internal-test-utils').act;
17
const renderSubtreeIntoContainer =
18
require('react-dom').unstable_renderSubtreeIntoContainer;
@@ -60,7 +59,8 @@ describe('renderSubtreeIntoContainer', () => {
59
}
60
}
61
63
- ReactTestUtils.renderIntoDocument(<Parent />);
62
+ const container = document.createElement('div');
63
+ ReactDOM.render(<Parent />, container);
64
expect(portal.firstChild.innerHTML).toBe('bar');
65
});
66
packages/react/src/__tests__/ReactTypeScriptClass-test.ts
-1
@@ -14,7 +14,6 @@
14
import React = require('react');
15
import ReactDOM = require('react-dom');
16
import ReactDOMClient = require('react-dom/client');
17
-import ReactDOMTestUtils = require('react-dom/test-utils');
17
import PropTypes = require('prop-types');
18
import ReactFeatureFlags = require('shared/ReactFeatureFlags');
19