{"parents":["7b196be09167f8fe9091168dab1769a552263065"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js"}],"body":"","patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\nindex ea4d8480c7..154772a168 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n@@ -12,7 +12,6 @@\n let React;\n let ReactDOM;\n let ReactDOMClient;\n-let ReactTestUtils;\n let act;\n let Scheduler;\n let waitForAll;\n@@ -25,7 +24,6 @@ describe('ReactUpdates', () => {\n React = require('react');\n ReactDOM = require('react-dom');\n ReactDOMClient = require('react-dom\/client');\n- ReactTestUtils = require('react-dom\/test-utils');\n act = require('internal-test-utils').act;\n Scheduler = require('scheduler');\n \n@@ -832,7 +830,7 @@ describe('ReactUpdates', () => {\n expect(updates).toEqual([0, 1, 2, 0, 1, 2]);\n });\n \n- it('should queue nested updates', () => {\n+ it('should queue nested updates', async () => {\n \/\/ See https:\/\/github.com\/facebook\/react\/issues\/1147\n \n class X extends React.Component {\n@@ -877,11 +875,25 @@ describe('ReactUpdates', () => {\n }\n }\n \n- const x = ReactTestUtils.renderIntoDocument();\n- const y = ReactTestUtils.renderIntoDocument();\n+ let container = document.createElement('div');\n+ let root = ReactDOMClient.createRoot(container);\n+ let x;\n+ await act(() => {\n+ root.render( (x = current)} \/>);\n+ });\n+\n+ container = document.createElement('div');\n+ root = ReactDOMClient.createRoot(container);\n+ let y;\n+ await act(() => {\n+ root.render( (y = current)} \/>);\n+ });\n+\n expect(ReactDOM.findDOMNode(x).textContent).toBe('0');\n \n- y.forceUpdate();\n+ await act(() => {\n+ y.forceUpdate();\n+ });\n expect(ReactDOM.findDOMNode(x).textContent).toBe('1');\n });\n \n@@ -1004,7 +1016,7 @@ describe('ReactUpdates', () => {\n assertLog([]);\n });\n \n- it('throws in setState if the update callback is not a function', () => {\n+ it('throws in setState if the update callback is not a function', async () => {\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -1018,36 +1030,62 @@ describe('ReactUpdates', () => {\n }\n }\n \n- let component = ReactTestUtils.renderIntoDocument();\n+ let container = document.createElement('div');\n+ let root = ReactDOMClient.createRoot(container);\n+ let component;\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n \n- expect(() => {\n- expect(() => component.setState({}, 'no')).toErrorDev(\n+ await expect(\n+ expect(async () => {\n+ await act(() => {\n+ component.setState({}, 'no');\n+ });\n+ }).toErrorDev(\n 'setState(...): Expected the last optional `callback` argument to be ' +\n 'a function. Instead received: no.',\n- );\n- }).toThrowError(\n+ ),\n+ ).rejects.toThrowError(\n 'Invalid argument passed as callback. Expected a function. Instead ' +\n 'received: no',\n );\n- component = ReactTestUtils.renderIntoDocument();\n- expect(() => {\n- expect(() => component.setState({}, {foo: 'bar'})).toErrorDev(\n+ container = document.createElement('div');\n+ root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n+\n+ await expect(\n+ expect(async () => {\n+ await act(() => {\n+ component.setState({}, {foo: 'bar'});\n+ });\n+ }).toErrorDev(\n 'setState(...): Expected the last optional `callback` argument to be ' +\n 'a function. Instead received: [object Object].',\n- );\n- }).toThrowError(\n+ ),\n+ ).rejects.toThrowError(\n 'Invalid argument passed as callback. Expected a function. Instead ' +\n 'received: [object Object]',\n );\n- \/\/ Make sure the warning is deduplicated and doesn't fire again\n- component = ReactTestUtils.renderIntoDocument();\n- expect(() => component.setState({}, new Foo())).toThrowError(\n+ container = document.createElement('div');\n+ root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n+\n+ await expect(\n+ act(() => {\n+ component.setState({}, new Foo());\n+ }),\n+ ).rejects.toThrowError(\n 'Invalid argument passed as callback. Expected a function. Instead ' +\n 'received: [object Object]',\n );\n });\n \n- it('throws in forceUpdate if the update callback is not a function', () => {\n+ it('throws in forceUpdate if the update callback is not a function', async () => {\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -1061,30 +1099,57 @@ describe('ReactUpdates', () => {\n }\n }\n \n- let component = ReactTestUtils.renderIntoDocument();\n+ let container = document.createElement('div');\n+ let root = ReactDOMClient.createRoot(container);\n+ let component;\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n \n- expect(() => {\n- expect(() => component.forceUpdate('no')).toErrorDev(\n+ await expect(\n+ expect(async () => {\n+ await act(() => {\n+ component.forceUpdate('no');\n+ });\n+ }).toErrorDev(\n 'forceUpdate(...): Expected the last optional `callback` argument to be ' +\n 'a function. Instead received: no.',\n- );\n- }).toThrowError(\n+ ),\n+ ).rejects.toThrowError(\n 'Invalid argument passed as callback. Expected a function. Instead ' +\n 'received: no',\n );\n- component = ReactTestUtils.renderIntoDocument();\n- expect(() => {\n- expect(() => component.forceUpdate({foo: 'bar'})).toErrorDev(\n+ container = document.createElement('div');\n+ root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n+\n+ await expect(\n+ expect(async () => {\n+ await act(() => {\n+ component.forceUpdate({foo: 'bar'});\n+ });\n+ }).toErrorDev(\n 'forceUpdate(...): Expected the last optional `callback` argument to be ' +\n 'a function. Instead received: [object Object].',\n- );\n- }).toThrowError(\n+ ),\n+ ).rejects.toThrowError(\n 'Invalid argument passed as callback. Expected a function. Instead ' +\n 'received: [object Object]',\n );\n \/\/ Make sure the warning is deduplicated and doesn't fire again\n- component = ReactTestUtils.renderIntoDocument();\n- expect(() => component.forceUpdate(new Foo())).toThrowError(\n+ container = document.createElement('div');\n+ root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n+\n+ await expect(\n+ act(() => {\n+ component.forceUpdate(new Foo());\n+ }),\n+ ).rejects.toThrowError(\n 'Invalid argument passed as callback. Expected a function. Instead ' +\n 'received: [object Object]',\n );\n","commit":{"authorEmail":"silbermann.sebastian@gmail.com","revision":"48ca0e82985a1f0cdd2787a281166a59af4b88d0","subject":"Remove ReactTestUtils from ReactUpdates (#28378)","authorName":"Sebastian Silbermann","authoredAt":"2024-02-20T16:52:11+01:00","shortRevision":"48ca0e8298"}}

dillon1000/react

Files changed