From 2c11ee6dd1a9ab77774187abcf2c5f1f8705dcfb Mon Sep 17 00:00:00 2001
From: Jack Pope <jackpope@meta.com>
Date: Mon, 22 Jan 2024 14:36:44 -0500
Subject: [PATCH 1/2] Use createRoot for ReactTreeTraversal-test

---
 .../src/__tests__/ReactTreeTraversal-test.js      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js
index 53be0cbdb2d6d..a3a0d73e9a47e 100644
--- a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js
+++ b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js
@@ -10,7 +10,9 @@
 'use strict';
 
 let React;
-let ReactDOM;
+let ReactDOMClient;
+let act;
+let root;
 
 const ChildComponent = ({id, eventHandler}) => (
   <div
@@ -68,9 +70,10 @@ describe('ReactTreeTraversal', () => {
   let outerNode1;
   let outerNode2;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     React = require('react');
-    ReactDOM = require('react-dom');
+    ReactDOMClient = require('react-dom/client');
+    act = require('internal-test-utils').act;
 
     mockFn.mockReset();
 
@@ -81,10 +84,14 @@ describe('ReactTreeTraversal', () => {
     document.body.appendChild(outerNode1);
     document.body.appendChild(outerNode2);
 
-    ReactDOM.render(<ParentComponent eventHandler={mockFn} />, container);
+    root = ReactDOMClient.createRoot(container);
+    await act(() => {
+      root.render(<ParentComponent eventHandler={mockFn} />);
+    })
   });
 
   afterEach(() => {
+    root.unmount();
     document.body.removeChild(container);
     document.body.removeChild(outerNode1);
     document.body.removeChild(outerNode2);

From f96a4480ad1fed310fe0dcdfaa20eb4989e96a88 Mon Sep 17 00:00:00 2001
From: Jack Pope <jackpope@meta.com>
Date: Mon, 22 Jan 2024 16:38:11 -0500
Subject: [PATCH 2/2] Fix lint, remove unmount

---
 packages/react-dom/src/__tests__/ReactTreeTraversal-test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js
index a3a0d73e9a47e..b9de69de85c41 100644
--- a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js
+++ b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js
@@ -87,11 +87,10 @@ describe('ReactTreeTraversal', () => {
     root = ReactDOMClient.createRoot(container);
     await act(() => {
       root.render(<ParentComponent eventHandler={mockFn} />);
-    })
+    });
   });
 
   afterEach(() => {
-    root.unmount();
     document.body.removeChild(container);
     document.body.removeChild(outerNode1);
     document.body.removeChild(outerNode2);