diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js
index 08f0b1a8a7de..7e46bea5f93d 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js
@@ -15,7 +15,7 @@
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
let React;
-let ReactDOM;
+let ReactDOMClient;
let ReactDOMServer;
let ReactTestUtils;
let useState;
@@ -39,7 +39,7 @@ function initModules() {
jest.resetModules();
React = require('react');
- ReactDOM = require('react-dom');
+ ReactDOMClient = require('react-dom/client');
ReactDOMServer = require('react-dom/server');
ReactTestUtils = require('react-dom/test-utils');
useState = React.useState;
@@ -67,14 +67,19 @@ function initModules() {
// Make them available to the helpers.
return {
- ReactDOM,
+ ReactDOMClient,
ReactDOMServer,
ReactTestUtils,
};
}
-const {resetModules, itRenders, itThrowsWhenRendering, serverRender} =
- ReactDOMServerIntegrationUtils(initModules);
+const {
+ resetModules,
+ itRenders,
+ itThrowsWhenRendering,
+ clientRenderOnBadMarkup,
+ serverRender,
+} = ReactDOMServerIntegrationUtils(initModules);
describe('ReactDOMServerHooks', () => {
beforeEach(() => {
@@ -422,8 +427,13 @@ describe('ReactDOMServerHooks', () => {
});
return 'hi';
}
-
- const domNode = await render(, 1);
+ const domNode = await render(
+ ,
+ render === clientRenderOnBadMarkup
+ ? // On hydration mismatch we retry and therefore log the warning again.
+ 2
+ : 1,
+ );
expect(domNode.textContent).toEqual('hi');
});
@@ -436,7 +446,13 @@ describe('ReactDOMServerHooks', () => {
return value;
}
- const domNode = await render(, 1);
+ const domNode = await render(
+ ,
+ render === clientRenderOnBadMarkup
+ ? // On hydration mismatch we retry and therefore log the warning again.
+ 2
+ : 1,
+ );
expect(domNode.textContent).toEqual('0');
});
});
@@ -859,7 +875,13 @@ describe('ReactDOMServerHooks', () => {
return ;
}
- const domNode1 = await render(, 1);
+ const domNode1 = await render(
+ ,
+ render === clientRenderOnBadMarkup
+ ? // On hydration mismatch we retry and therefore log the warning again.
+ 2
+ : 1,
+ );
expect(domNode1.textContent).toEqual('42');
const domNode2 = await render(, 1);
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
index cfcfc323e1d3..cf0167eef1fd 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
@@ -13,7 +13,7 @@
const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
let React;
-let ReactDOM;
+let ReactDOMClient;
let ReactDOMServer;
let ReactTestUtils;
@@ -21,19 +21,20 @@ function initModules() {
// Reset warning cache.
jest.resetModules();
React = require('react');
- ReactDOM = require('react-dom');
+ ReactDOMClient = require('react-dom/client');
ReactDOMServer = require('react-dom/server');
ReactTestUtils = require('react-dom/test-utils');
// Make them available to the helpers.
return {
- ReactDOM,
+ ReactDOMClient,
ReactDOMServer,
ReactTestUtils,
};
}
-const {resetModules, itRenders} = ReactDOMServerIntegrationUtils(initModules);
+const {resetModules, itRenders, clientRenderOnBadMarkup} =
+ ReactDOMServerIntegrationUtils(initModules);
describe('ReactDOMServerIntegration', () => {
beforeEach(() => {
@@ -365,8 +366,13 @@ describe('ReactDOMServerIntegration', () => {
);
};
- // We expect 1 error.
- await render(, 1);
+ await render(
+ ,
+ render === clientRenderOnBadMarkup
+ ? // On hydration mismatch we retry and therefore log the warning again.
+ 2
+ : 1,
+ );
},
);
@@ -391,8 +397,14 @@ describe('ReactDOMServerIntegration', () => {
);
};
- // We expect 1 error.
- await render(, 1);
+
+ await render(
+ ,
+ render === clientRenderOnBadMarkup
+ ? // On hydration mismatch we retry and therefore log the warning again.
+ 2
+ : 1,
+ );
},
);