From 54f2314e9cfe82baf1c040a55ed4dfff6488f84e Mon Sep 17 00:00:00 2001
From: Jack Pope <jackpope1@gmail.com>
Date: Fri, 26 Jan 2024 17:28:58 -0500
Subject: [PATCH] Use createRoot in ReactMockedComponent-test (#28087)

Co-authored-by: Jack Pope <jackpope@meta.com>
---
 .../__tests__/ReactMockedComponent-test.js    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactMockedComponent-test.js b/packages/react-dom/src/__tests__/ReactMockedComponent-test.js
index fcd0bb582536c..0e286ba893173 100644
--- a/packages/react-dom/src/__tests__/ReactMockedComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactMockedComponent-test.js
@@ -10,7 +10,8 @@
 'use strict';
 
 let React;
-let ReactDOM;
+let ReactDOMClient;
+let act;
 
 let MockedComponent;
 let ReactDOMServer;
@@ -18,8 +19,9 @@ let ReactDOMServer;
 describe('ReactMockedComponent', () => {
   beforeEach(() => {
     React = require('react');
-    ReactDOM = require('react-dom');
+    ReactDOMClient = require('react-dom/client');
     ReactDOMServer = require('react-dom/server');
+    act = require('internal-test-utils').act;
 
     MockedComponent = class extends React.Component {
       render() {
@@ -30,15 +32,23 @@ describe('ReactMockedComponent', () => {
     MockedComponent.prototype.render = jest.fn();
   });
 
-  it('should allow a mocked component to be rendered', () => {
+  it('should allow a mocked component to be rendered', async () => {
     const container = document.createElement('container');
-    ReactDOM.render(<MockedComponent />, container);
+    const root = ReactDOMClient.createRoot(container);
+    await act(() => {
+      root.render(<MockedComponent />);
+    });
   });
 
-  it('should allow a mocked component to be updated in dev', () => {
+  it('should allow a mocked component to be updated in dev', async () => {
     const container = document.createElement('container');
-    ReactDOM.render(<MockedComponent />, container);
-    ReactDOM.render(<MockedComponent />, container);
+    const root = ReactDOMClient.createRoot(container);
+    await act(() => {
+      root.render(<MockedComponent />);
+    });
+    await act(() => {
+      root.render(<MockedComponent />);
+    });
   });
 
   it('should allow a mocked component to be rendered in dev (SSR)', () => {