{"body":"moar assert helpers\n\nthis finishes all of react-dom except the server integration tests which\nare tricky to convert","patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMInvalidARIAHook-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMInvalidARIAHook-test.js\nindex 6f1012b9a8..725cedab1f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMInvalidARIAHook-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMInvalidARIAHook-test.js\n@@ -14,12 +14,15 @@ describe('ReactDOMInvalidARIAHook', () => {\n let ReactDOMClient;\n let mountComponent;\n let act;\n+ let assertConsoleErrorDev;\n \n beforeEach(() => {\n jest.resetModules();\n React = require('react');\n ReactDOMClient = require('react-dom\/client');\n act = require('internal-test-utils').act;\n+ assertConsoleErrorDev =\n+ require('internal-test-utils').assertConsoleErrorDev;\n \n mountComponent = async function (props) {\n const container = document.createElement('div');\n@@ -35,46 +38,52 @@ describe('ReactDOMInvalidARIAHook', () => {\n await mountComponent({'aria-label': 'Bumble bees'});\n });\n it('should warn for one invalid aria-* prop', async () => {\n- await expect(() => mountComponent({'aria-badprop': 'maybe'})).toErrorDev(\n+ await mountComponent({'aria-badprop': 'maybe'});\n+ assertConsoleErrorDev([\n 'Invalid aria prop `aria-badprop` on

tag. ' +\n- 'For details, see https:\/\/react.dev\/link\/invalid-aria-props',\n- );\n+ 'For details, see https:\/\/react.dev\/link\/invalid-aria-props\\n' +\n+ ' in div (at **)',\n+ ]);\n });\n it('should warn for many invalid aria-* props', async () => {\n- await expect(() =>\n- mountComponent({\n- 'aria-badprop': 'Very tall trees',\n- 'aria-malprop': 'Turbulent seas',\n- }),\n- ).toErrorDev(\n+ await mountComponent({\n+ 'aria-badprop': 'Very tall trees',\n+ 'aria-malprop': 'Turbulent seas',\n+ });\n+ assertConsoleErrorDev([\n 'Invalid aria props `aria-badprop`, `aria-malprop` on

' +\n- 'tag. For details, see https:\/\/react.dev\/link\/invalid-aria-props',\n- );\n+ 'tag. For details, see https:\/\/react.dev\/link\/invalid-aria-props\\n' +\n+ ' in div (at **)',\n+ ]);\n });\n it('should warn for an improperly cased aria-* prop', async () => {\n \/\/ The valid attribute name is aria-haspopup.\n- await expect(() => mountComponent({'aria-hasPopup': 'true'})).toErrorDev(\n+ await mountComponent({'aria-hasPopup': 'true'});\n+ assertConsoleErrorDev([\n 'Unknown ARIA attribute `aria-hasPopup`. ' +\n- 'Did you mean `aria-haspopup`?',\n- );\n+ 'Did you mean `aria-haspopup`?\\n' +\n+ ' in div (at **)',\n+ ]);\n });\n \n it('should warn for use of recognized camel case aria attributes', async () => {\n \/\/ The valid attribute name is aria-haspopup.\n- await expect(() => mountComponent({ariaHasPopup: 'true'})).toErrorDev(\n+ await mountComponent({ariaHasPopup: 'true'});\n+ assertConsoleErrorDev([\n 'Invalid ARIA attribute `ariaHasPopup`. ' +\n- 'Did you mean `aria-haspopup`?',\n- );\n+ 'Did you mean `aria-haspopup`?\\n' +\n+ ' in div (at **)',\n+ ]);\n });\n \n it('should warn for use of unrecognized camel case aria attributes', async () => {\n \/\/ The valid attribute name is aria-haspopup.\n- await expect(() =>\n- mountComponent({ariaSomethingInvalid: 'true'}),\n- ).toErrorDev(\n+ await mountComponent({ariaSomethingInvalid: 'true'});\n+ assertConsoleErrorDev([\n 'Invalid ARIA attribute `ariaSomethingInvalid`. ARIA ' +\n- 'attributes follow the pattern aria-* and must be lowercase.',\n- );\n+ 'attributes follow the pattern aria-* and must be lowercase.\\n' +\n+ ' in div (at **)',\n+ ]);\n });\n });\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyComponentTree-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyComponentTree-test.internal.js\nindex 8465e68703..e1ba041576 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyComponentTree-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyComponentTree-test.internal.js\n@@ -13,10 +13,13 @@ describe('ReactDOMComponentTree', () => {\n let React;\n let ReactDOM;\n let container;\n+ let assertConsoleErrorDev;\n \n beforeEach(() => {\n React = require('react');\n ReactDOM = require('react-dom');\n+ assertConsoleErrorDev =\n+ require('internal-test-utils').assertConsoleErrorDev;\n \n container = document.createElement('div');\n document.body.appendChild(container);\n@@ -31,11 +34,14 @@ describe('ReactDOMComponentTree', () => {\n it('finds instance of node that is attempted to be unmounted', () => {\n const component =

;\n const node = ReactDOM.render(

{component}<\/div>, container);\n- expect(() => ReactDOM.unmountComponentAtNode(node)).toErrorDev(\n- \"unmountComponentAtNode(): The node you're attempting to unmount \" +\n- 'was rendered by React and is not a top-level container. You may ' +\n- 'have accidentally passed in a React root node instead of its ' +\n- 'container.',\n+ ReactDOM.unmountComponentAtNode(node);\n+ assertConsoleErrorDev(\n+ [\n+ \"unmountComponentAtNode(): The node you're attempting to unmount \" +\n+ 'was rendered by React and is not a top-level container. You may ' +\n+ 'have accidentally passed in a React root node instead of its ' +\n+ 'container.',\n+ ],\n {withoutStack: true},\n );\n });\n@@ -49,11 +55,14 @@ describe('ReactDOMComponentTree', () => {\n );\n const anotherComponent =

;\n const instance = ReactDOM.render(component, container);\n- expect(() => ReactDOM.render(anotherComponent, instance)).toErrorDev(\n- 'Replacing React-rendered children with a new root ' +\n- 'component. If you intended to update the children of this node, ' +\n- 'you should instead have the existing children update their state ' +\n- 'and render the new components instead of calling ReactDOM.render.',\n+ ReactDOM.render(anotherComponent, instance);\n+ assertConsoleErrorDev(\n+ [\n+ 'Replacing React-rendered children with a new root ' +\n+ 'component. If you intended to update the children of this node, ' +\n+ 'you should instead have the existing children update their state ' +\n+ 'and render the new components instead of calling ReactDOM.render.',\n+ ],\n {withoutStack: true},\n );\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyFiber-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyFiber-test.js\nindex c799e3b904..9c1e7f030e 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyFiber-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMLegacyFiber-test.js\n@@ -13,11 +13,14 @@ const React = require('react');\n const ReactDOM = require('react-dom');\n const PropTypes = require('prop-types');\n let act;\n+let assertConsoleErrorDev;\n describe('ReactDOMLegacyFiber', () => {\n let container;\n \n beforeEach(() => {\n act = require('internal-test-utils').act;\n+ assertConsoleErrorDev =\n+ require('internal-test-utils').assertConsoleErrorDev;\n container = document.createElement('div');\n document.body.appendChild(container);\n });\n@@ -786,9 +789,8 @@ describe('ReactDOMLegacyFiber', () => {\n }\n }\n \n- expect(() => {\n- ReactDOM.render(, container);\n- }).toErrorDev([\n+ ReactDOM.render(, container);\n+ assertConsoleErrorDev([\n 'Parent uses the legacy childContextTypes API which will soon be removed. Use React.createContext() instead.',\n 'Component uses the legacy contextTypes API which will soon be removed. Use React.createContext() with static contextType instead.',\n ]);\n@@ -834,10 +836,8 @@ describe('ReactDOMLegacyFiber', () => {\n }\n }\n \n- let instance;\n- expect(() => {\n- instance = ReactDOM.render(, container);\n- }).toErrorDev([\n+ const instance = ReactDOM.render(, container);\n+ assertConsoleErrorDev([\n 'Parent uses the legacy childContextTypes API which will soon be removed. Use React.createContext() instead.',\n 'Component uses the legacy contextTypes API which will soon be removed. Use React.createContext() with static contextType instead.',\n ]);\n@@ -882,9 +882,8 @@ describe('ReactDOMLegacyFiber', () => {\n }\n }\n \n- expect(() => {\n- ReactDOM.render(, container);\n- }).toErrorDev([\n+ ReactDOM.render(, container);\n+ assertConsoleErrorDev([\n 'Parent uses the legacy childContextTypes API which will soon be removed. Use React.createContext() instead.',\n 'Component uses the legacy contextTypes API which will soon be removed. Use React.createContext() with static contextType instead.',\n ]);\n@@ -1117,11 +1116,12 @@ describe('ReactDOMLegacyFiber', () => {\n return

;\n }\n }\n- expect(() => ReactDOM.render(, container)).toErrorDev(\n+ ReactDOM.render(, container);\n+ assertConsoleErrorDev([\n 'Expected `onClick` listener to be a function, instead got a value of `string` type.\\n' +\n ' in div (at **)\\n' +\n ' in Example (at **)',\n- );\n+ ]);\n });\n \n \/\/ @gate !disableLegacyMode\n@@ -1131,13 +1131,14 @@ describe('ReactDOMLegacyFiber', () => {\n return

;\n }\n }\n- expect(() => ReactDOM.render(, container)).toErrorDev(\n+ ReactDOM.render(, container);\n+ assertConsoleErrorDev([\n 'Expected `onClick` listener to be a function, instead got `false`.\\n\\n' +\n 'If you used to conditionally omit it with onClick={condition && value}, ' +\n 'pass onClick={condition ? value : undefined} instead.\\n' +\n ' in div (at **)\\n' +\n ' in Example (at **)',\n- );\n+ ]);\n });\n \n \/\/ @gate !disableLegacyMode\n@@ -1270,17 +1271,18 @@ describe('ReactDOMLegacyFiber', () => {\n container.innerHTML = '

MEOW.<\/div>';\n \n await expect(async () => {\n- await expect(async () => {\n- await act(() => {\n- ReactDOM.render(

baz<\/div>, container);\n- });\n- }).rejects.toThrow('The node to be removed is not a child of this node.');\n- }).toErrorDev(\n- '' +\n- 'It looks like the React-rendered content of this container was ' +\n- 'removed without using React. This is not supported and will ' +\n- 'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +\n- 'to empty a container.',\n+ await act(() => {\n+ ReactDOM.render(

baz<\/div>, container);\n+ });\n+ }).rejects.toThrow('The node to be removed is not a child of this node.');\n+ assertConsoleErrorDev(\n+ [\n+ '' +\n+ 'It looks like the React-rendered content of this container was ' +\n+ 'removed without using React. This is not supported and will ' +\n+ 'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +\n+ 'to empty a container.',\n+ ],\n {withoutStack: true},\n );\n });\n@@ -1293,12 +1295,15 @@ describe('ReactDOMLegacyFiber', () => {\n expect(container.innerHTML).toBe('

bar<\/div>');\n \/\/ then we mess with the DOM before an update\n container.innerHTML = '

MEOW.<\/div>';\n- expect(() => ReactDOM.render(

baz<\/div>, container)).toErrorDev(\n- '' +\n- 'It looks like the React-rendered content of this container was ' +\n- 'removed without using React. This is not supported and will ' +\n- 'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +\n- 'to empty a container.',\n+ ReactDOM.render(

bar<\/div>');\n \/\/ then we mess with the DOM before an update\n container.innerHTML = '';\n- expect(() => ReactDOM.render(

baz<\/div>, container);\n+ assertConsoleErrorDev(\n+ [\n+ '' +\n+ 'It looks like the React-rendered content of this container was ' +\n+ 'removed without using React. This is not supported and will ' +\n+ 'cause errors. Instead, call ReactDOM.unmountComponentAtNode ' +\n+ 'to empty a container.',\n+ ],\n {withoutStack: true},\n );\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMOption-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMOption-test.js\nindex ce5e3c65bc..cb4270cd1e 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMOption-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMOption-test.js\n@@ -14,6 +14,7 @@ describe('ReactDOMOption', () => {\n let ReactDOMClient;\n let ReactDOMServer;\n let act;\n+ let assertConsoleErrorDev;\n \n beforeEach(() => {\n jest.resetModules();\n@@ -21,6 +22,8 @@ describe('ReactDOMOption', () => {\n ReactDOMClient = require('react-dom\/client');\n ReactDOMServer = require('react-dom\/server');\n act = require('internal-test-utils').act;\n+ assertConsoleErrorDev =\n+ require('internal-test-utils').assertConsoleErrorDev;\n });\n \n async function renderIntoDocument(children) {\n@@ -47,10 +50,8 @@ describe('ReactDOMOption', () => {\n {1}

{2}\n <\/option>\n );\n- let container;\n- await expect(async () => {\n- container = await renderIntoDocument(el);\n- }).toErrorDev(\n+ const container = await renderIntoDocument(el);\n+ assertConsoleErrorDev([\n 'In HTML,

cannot be a child of

dillon1000/react

Files changed