{"parents":["b2d637128c89d450355622379e97c6c6b1c79435"],"commit":{"shortRevision":"9e13800e57","authorName":"Jack Pope","authoredAt":"2024-01-23T17:05:01-05:00","authorEmail":"jackpope1@gmail.com","revision":"9e13800e5731435a1e8ff4bd0266e7cd4adc8d4f","subject":"Remove ReactTestUtils from ReactArt-test (#28059)"},"files":[{"status":"M","path":"packages\/react-art\/src\/__tests__\/ReactART-test.js"}],"patch":"diff --git a\/packages\/react-art\/src\/__tests__\/ReactART-test.js b\/packages\/react-art\/src\/__tests__\/ReactART-test.js\nindex 47b5958cf4..3204e21b9e 100644\n--- a\/packages\/react-art\/src\/__tests__\/ReactART-test.js\n+++ b\/packages\/react-art\/src\/__tests__\/ReactART-test.js\n@@ -25,7 +25,8 @@ import Wedge from 'react-art\/Wedge';\n \/\/ Isolate DOM renderer.\n jest.resetModules();\n const ReactDOM = require('react-dom');\n-const ReactTestUtils = require('react-dom\/test-utils');\n+const ReactDOMClient = require('react-dom\/client');\n+const act = require('internal-test-utils').act;\n \n \/\/ Isolate test renderer.\n jest.resetModules();\n@@ -42,6 +43,7 @@ let Surface;\n let TestComponent;\n \n let waitFor;\n+let groupRef;\n \n const Missing = {};\n \n@@ -82,8 +84,9 @@ describe('ReactART', () => {\n \n ({waitFor} = require('internal-test-utils'));\n \n+ groupRef = React.createRef();\n TestComponent = class extends React.Component {\n- group = React.createRef();\n+ group = groupRef;\n \n render() {\n const a = (\n@@ -132,17 +135,23 @@ describe('ReactART', () => {\n container = null;\n });\n \n- it('should have the correct lifecycle state', () => {\n- let instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- const group = instance.group.current;\n+ it('should have the correct lifecycle state', async () => {\n+ const instance = ;\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(instance);\n+ });\n+ const group = groupRef.current;\n \/\/ Duck type test for an ART group\n expect(typeof group.indicate).toBe('function');\n });\n \n- it('should render a reasonable SVG structure in SVG mode', () => {\n- let instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n+ it('should render a reasonable SVG structure in SVG mode', async () => {\n+ const instance = ;\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(instance);\n+ });\n \n const expectedStructure = {\n nodeName: 'svg',\n@@ -165,7 +174,7 @@ describe('ReactART', () => {\n ],\n };\n \n- const realNode = ReactDOM.findDOMNode(instance);\n+ const realNode = container.firstChild;\n testDOMNodeStructure(realNode, expectedStructure);\n });\n \n@@ -243,7 +252,7 @@ describe('ReactART', () => {\n ReactDOM.unmountComponentAtNode(container);\n });\n \n- it('renders composite with lifecycle inside group', () => {\n+ it('renders composite with lifecycle inside group', async () => {\n let mounted = false;\n \n class CustomShape extends React.Component {\n@@ -255,18 +264,20 @@ describe('ReactART', () => {\n mounted = true;\n }\n }\n-\n- ReactTestUtils.renderIntoDocument(\n- \n- \n- \n- <\/Group>\n- <\/Surface>,\n- );\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(\n+ \n+ \n+ \n+ <\/Group>\n+ <\/Surface>,\n+ );\n+ });\n expect(mounted).toBe(true);\n });\n \n- it('resolves refs before componentDidMount', () => {\n+ it('resolves refs before componentDidMount', async () => {\n class CustomShape extends React.Component {\n render() {\n return ;\n@@ -293,7 +304,10 @@ describe('ReactART', () => {\n }\n }\n \n- ReactTestUtils.renderIntoDocument();\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n+ });\n expect(ref.constructor).toBe(CustomShape);\n });\n \n","body":""}

dillon1000/react

Files changed