Skip to content

Commit b25dcd3

Browse files
authored
Add ReactDOMClient to ServerIntegration tests (minor fixes) (#28131)
## Overview Branched off #28130 Converts to `createRoot`, with a few additional in-line conversions in each file.
1 parent 2a45118 commit b25dcd3

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const ReactFeatureFlags = require('shared/ReactFeatureFlags');
1515

1616
let React;
1717
let ReactDOM;
18+
let ReactDOMClient;
1819
let ReactTestUtils;
1920
let ReactDOMServer;
2021

@@ -23,12 +24,13 @@ function initModules() {
2324
jest.resetModules();
2425
React = require('react');
2526
ReactDOM = require('react-dom');
27+
ReactDOMClient = require('react-dom/client');
2628
ReactDOMServer = require('react-dom/server');
2729
ReactTestUtils = require('react-dom/test-utils');
2830

2931
// Make them available to the helpers.
3032
return {
31-
ReactDOM,
33+
ReactDOMClient,
3234
ReactDOMServer,
3335
ReactTestUtils,
3436
};
@@ -638,7 +640,12 @@ describe('ReactDOMServerIntegration', () => {
638640
// DOM nodes on the client side. We force it to fire early
639641
// so that it gets deduplicated later, and doesn't fail the test.
640642
expect(() => {
641-
ReactDOM.render(<nonstandard />, document.createElement('div'));
643+
ReactDOM.flushSync(() => {
644+
const root = ReactDOMClient.createRoot(
645+
document.createElement('div'),
646+
);
647+
root.render(<nonstandard />);
648+
});
642649
}).toErrorDev('The tag <nonstandard> is unrecognized in this browser.');
643650

644651
const e = await render(<nonstandard foo="bar" />);

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
1616

1717
let React;
18-
let ReactDOM;
1918
let ReactDOMClient;
2019
let ReactDOMServer;
2120
let ReactTestUtils;
@@ -35,15 +34,14 @@ describe('ReactDOMServerIntegration - Untrusted URLs', () => {
3534
function initModules() {
3635
jest.resetModules();
3736
React = require('react');
38-
ReactDOM = require('react-dom');
3937
ReactDOMClient = require('react-dom/client');
4038
ReactDOMServer = require('react-dom/server');
4139
ReactTestUtils = require('react-dom/test-utils');
4240
act = require('internal-test-utils').act;
4341

4442
// Make them available to the helpers.
4543
return {
46-
ReactDOM,
44+
ReactDOMClient,
4745
ReactDOMServer,
4846
ReactTestUtils,
4947
};
@@ -204,15 +202,14 @@ describe('ReactDOMServerIntegration - Untrusted URLs - disableJavaScriptURLs', (
204202
ReactFeatureFlags.disableJavaScriptURLs = true;
205203

206204
React = require('react');
207-
ReactDOM = require('react-dom');
208205
ReactDOMClient = require('react-dom/client');
209206
ReactDOMServer = require('react-dom/server');
210207
ReactTestUtils = require('react-dom/test-utils');
211208
act = require('internal-test-utils').act;
212209

213210
// Make them available to the helpers.
214211
return {
215-
ReactDOM,
212+
ReactDOMClient,
216213
ReactDOMServer,
217214
ReactTestUtils,
218215
};

0 commit comments

Comments
 (0)