Add ReactDOMClient to ServerIntegration tests (minor fixes) (#28131)
## Overview Branched off https://github.com/facebook/react/pull/28130 Converts to `createRoot`, with a few additional in-line conversions in each file.
Ricky committed
Feb 1, 2024 at 19:01 UTC
b25dcd3958872322cbeff797ba99c0856de1ebbc
2 files changed
+11
-7
packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
+9
-2
@@ -15,6 +15,7 @@ const ReactFeatureFlags = require('shared/ReactFeatureFlags');
15
16
let React;
17
let ReactDOM;
18
+let ReactDOMClient;
19
let ReactTestUtils;
20
let ReactDOMServer;
21
@@ -23,12 +24,13 @@ function initModules() {
24
jest.resetModules();
25
React = require('react');
26
ReactDOM = require('react-dom');
27
+ ReactDOMClient = require('react-dom/client');
28
ReactDOMServer = require('react-dom/server');
29
ReactTestUtils = require('react-dom/test-utils');
30
31
// Make them available to the helpers.
32
return {
31
- ReactDOM,
33
+ ReactDOMClient,
34
ReactDOMServer,
35
ReactTestUtils,
36
};
@@ -638,7 +640,12 @@ describe('ReactDOMServerIntegration', () => {
640
// DOM nodes on the client side. We force it to fire early
641
// so that it gets deduplicated later, and doesn't fail the test.
642
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
+ });
649
}).toErrorDev('The tag <nonstandard> is unrecognized in this browser.');
650
651
const e = await render(<nonstandard foo="bar" />);
packages/react-dom/src/__tests__/ReactDOMServerIntegrationUntrustedURL-test.js
+2
-5
@@ -15,7 +15,6 @@
15
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
16
17
let React;
18
-let ReactDOM;
18
let ReactDOMClient;
19
let ReactDOMServer;
20
let ReactTestUtils;
@@ -35,7 +34,6 @@ describe('ReactDOMServerIntegration - Untrusted URLs', () => {
34
function initModules() {
35
jest.resetModules();
36
React = require('react');
38
- ReactDOM = require('react-dom');
37
ReactDOMClient = require('react-dom/client');
38
ReactDOMServer = require('react-dom/server');
39
ReactTestUtils = require('react-dom/test-utils');
@@ -43,7 +41,7 @@ describe('ReactDOMServerIntegration - Untrusted URLs', () => {
41
42
// Make them available to the helpers.
43
return {
46
- ReactDOM,
44
+ ReactDOMClient,
45
ReactDOMServer,
46
ReactTestUtils,
47
};
@@ -204,7 +202,6 @@ describe('ReactDOMServerIntegration - Untrusted URLs - disableJavaScriptURLs', (
202
ReactFeatureFlags.disableJavaScriptURLs = true;
203
204
React = require('react');
207
- ReactDOM = require('react-dom');
205
ReactDOMClient = require('react-dom/client');
206
ReactDOMServer = require('react-dom/server');
207
ReactTestUtils = require('react-dom/test-utils');
@@ -212,7 +209,7 @@ describe('ReactDOMServerIntegration - Untrusted URLs - disableJavaScriptURLs', (
209
210
// Make them available to the helpers.
211
return {
215
- ReactDOM,
212
+ ReactDOMClient,
213
ReactDOMServer,
214
ReactTestUtils,
215
};