Skip to content

Commit d9fa63a

Browse files
author
Sebastian Silbermann
committed
Remove remaining usages of ReactTestUtils in tests unrelated to react-dom/test-util
1 parent 850fac4 commit d9fa63a

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,12 +1237,14 @@ describe('ProfilingCache', () => {
12371237
);
12381238
}
12391239

1240-
const {Simulate} = require('react-dom/test-utils');
1241-
12421240
utils.act(() => render(<App />));
12431241
expect(getContainer().textContent).toBe('Home');
12441242
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+
);
12461248
utils.act(() => store.profilerStore.stopProfiling());
12471249
expect(getContainer().textContent).toBe('About');
12481250
});

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const {COMMENT_NODE} = require('react-dom-bindings/src/client/HTMLNodeType');
1414
let React;
1515
let ReactDOM;
1616
let ReactDOMServer;
17-
let ReactTestUtils;
1817
let Scheduler;
1918
let ReactDOMClient;
2019
let assertLog;
@@ -28,7 +27,6 @@ describe('ReactMount', () => {
2827
ReactDOM = require('react-dom');
2928
ReactDOMClient = require('react-dom/client');
3029
ReactDOMServer = require('react-dom/server');
31-
ReactTestUtils = require('react-dom/test-utils');
3230
Scheduler = require('scheduler');
3331

3432
const InternalTestUtils = require('internal-test-utils');
@@ -71,7 +69,10 @@ describe('ReactMount', () => {
7169
}
7270
}
7371

74-
expect(() => ReactTestUtils.renderIntoDocument(Component)).toErrorDev(
72+
expect(() => {
73+
const container = document.createElement('div');
74+
ReactDOM.render(Component, container);
75+
}).toErrorDev(
7576
'Functions are not valid as a React child. ' +
7677
'This may happen if you return Component instead of <Component /> from render. ' +
7778
'Or maybe you meant to call this function rather than return it.\n' +

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
const React = require('react');
1313
const ReactDOM = require('react-dom');
14-
const ReactTestUtils = require('react-dom/test-utils');
1514
const StrictMode = React.StrictMode;
1615

1716
describe('findDOMNode', () => {
@@ -31,7 +30,8 @@ describe('findDOMNode', () => {
3130
}
3231
}
3332

34-
const myNode = ReactTestUtils.renderIntoDocument(<MyNode />);
33+
const container = document.createElement('div');
34+
const myNode = ReactDOM.render(<MyNode />, container);
3535
const myDiv = ReactDOM.findDOMNode(myNode);
3636
const mySameDiv = ReactDOM.findDOMNode(myDiv);
3737
expect(myDiv.tagName).toBe('DIV');
@@ -99,7 +99,10 @@ describe('findDOMNode', () => {
9999
return <div />;
100100
}
101101
}
102-
expect(() => ReactTestUtils.renderIntoDocument(<Bar />)).not.toThrow();
102+
expect(() => {
103+
const container = document.createElement('div');
104+
ReactDOM.render(<Bar />, container);
105+
}).not.toThrow();
103106
});
104107

105108
// @gate !disableLegacyMode
@@ -117,8 +120,10 @@ describe('findDOMNode', () => {
117120
}
118121
}
119122

120-
ReactTestUtils.renderIntoDocument(
123+
const container = document.createElement('div');
124+
ReactDOM.render(
121125
<ContainsStrictModeChild ref={n => (parent = n)} />,
126+
container,
122127
);
123128

124129
let match;
@@ -145,10 +150,13 @@ describe('findDOMNode', () => {
145150
}
146151
}
147152

148-
ReactTestUtils.renderIntoDocument(
153+
const container = document.createElement('div');
154+
155+
ReactDOM.render(
149156
<StrictMode>
150157
<IsInStrictMode ref={n => (parent = n)} />
151158
</StrictMode>,
159+
container,
152160
);
153161

154162
let match;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const React = require('react');
1313
const PropTypes = require('prop-types');
1414
const ReactDOM = require('react-dom');
1515
const ReactDOMClient = require('react-dom/client');
16-
const ReactTestUtils = require('react-dom/test-utils');
1716
const act = require('internal-test-utils').act;
1817
const renderSubtreeIntoContainer =
1918
require('react-dom').unstable_renderSubtreeIntoContainer;
@@ -60,7 +59,8 @@ describe('renderSubtreeIntoContainer', () => {
6059
}
6160
}
6261

63-
ReactTestUtils.renderIntoDocument(<Parent />);
62+
const container = document.createElement('div');
63+
ReactDOM.render(<Parent />, container);
6464
expect(portal.firstChild.innerHTML).toBe('bar');
6565
});
6666

packages/react/src/__tests__/ReactTypeScriptClass-test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import React = require('react');
1515
import ReactDOM = require('react-dom');
1616
import ReactDOMClient = require('react-dom/client');
17-
import ReactDOMTestUtils = require('react-dom/test-utils');
1817
import PropTypes = require('prop-types');
1918
import ReactFeatureFlags = require('shared/ReactFeatureFlags');
2019

0 commit comments

Comments
 (0)