{"parents":["a7c898d83a991c48f3981fcc65d969f1d90d80a1"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\nindex ce71a6334e..65f82dcd36 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\n@@ -19,6 +19,7 @@ describe('ReactDOMComponent', () => {\n let act;\n let assertLog;\n let Scheduler;\n+ let assertConsoleErrorDev;\n \n beforeEach(() => {\n jest.resetModules();\n@@ -28,6 +29,8 @@ describe('ReactDOMComponent', () => {\n ReactDOMServer = require('react-dom\/server');\n Scheduler = require('scheduler');\n act = require('internal-test-utils').act;\n+ assertConsoleErrorDev =\n+ require('internal-test-utils').assertConsoleErrorDev;\n assertLog = require('internal-test-utils').assertLog;\n });\n \n@@ -189,73 +192,72 @@ describe('ReactDOMComponent', () => {\n it('should warn for unknown prop', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

{}} \/>);\n- });\n- }).toErrorDev(\n+ await act(() => {\n+ root.render(

{}} \/>);\n+ });\n+ assertConsoleErrorDev([\n 'Invalid value for prop `foo` on

tag. Either remove it ' +\n 'from the element, or pass a string or number value to keep ' +\n 'it in the DOM. For details, see https:\/\/react.dev\/link\/attribute-behavior ' +\n '\\n in div (at **)',\n- );\n+ ]);\n });\n \n it('should group multiple unknown prop warnings together', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

{}} baz={() => {}} \/>);\n- });\n- }).toErrorDev(\n+ await act(() => {\n+ root.render(

{}} baz={() => {}} \/>);\n+ });\n+ assertConsoleErrorDev([\n 'Invalid values for props `foo`, `baz` on

tag. Either remove ' +\n 'them from the element, or pass a string or number value to keep ' +\n 'them in the DOM. For details, see https:\/\/react.dev\/link\/attribute-behavior ' +\n '\\n in div (at **)',\n- );\n+ ]);\n });\n \n it('should warn for onDblClick prop', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

{}} \/>);\n- });\n- }).toErrorDev(\n- 'Invalid event handler property `onDblClick`. Did you mean `onDoubleClick`?\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

{}} \/>);\n+ });\n+ assertConsoleErrorDev([\n+ 'Invalid event handler property `onDblClick`. Did you mean `onDoubleClick`?\\n' +\n+ ' in div (at **)',\n+ ]);\n });\n \n it('should warn for unknown string event handlers', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

);\n- });\n- }).toErrorDev(\n- 'Unknown event handler property `onUnknown`. It will be ignored.\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

);\n+ });\n+ assertConsoleErrorDev([\n+ 'Unknown event handler property `onUnknown`. It will be ignored.\\n' +\n+ ' in div (at **)',\n+ ]);\n expect(container.firstChild.hasAttribute('onUnknown')).toBe(false);\n expect(container.firstChild.onUnknown).toBe(undefined);\n- await expect(async () => {\n- await act(() => {\n- root.render(

);\n- });\n- }).toErrorDev(\n- 'Unknown event handler property `onunknown`. It will be ignored.\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

);\n+ });\n+ assertConsoleErrorDev([\n+ 'Unknown event handler property `onunknown`. It will be ignored.\\n' +\n+ ' in div (at **)',\n+ ]);\n expect(container.firstChild.hasAttribute('onunknown')).toBe(false);\n expect(container.firstChild.onunknown).toBe(undefined);\n- await expect(async () => {\n- await act(() => {\n- root.render(

);\n- });\n- }).toErrorDev(\n- 'Unknown event handler property `on-unknown`. It will be ignored.\\n in div (at **)',\n- );\n+\n+ await act(() => {\n+ root.render(

);\n+ });\n+ assertConsoleErrorDev([\n+ 'Unknown event handler property `on-unknown`. It will be ignored.\\n' +\n+ ' in div (at **)',\n+ ]);\n expect(container.firstChild.hasAttribute('on-unknown')).toBe(false);\n expect(container.firstChild['on-unknown']).toBe(undefined);\n });\n@@ -263,31 +265,31 @@ describe('ReactDOMComponent', () => {\n it('should warn for unknown function event handlers', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

);\n- });\n- }).toErrorDev(\n- 'Unknown event handler property `onUnknown`. It will be ignored.\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

);\n- });\n- }).toErrorDev(\n- 'Unknown event handler property `onunknown`. It will be ignored.\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

);\n- });\n- }).toErrorDev(\n- 'Unknown event handler property `on-unknown`. It will be ignored.\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

);\n+ });\n+ assertConsoleErrorDev([\n+ 'Unknown event handler property `on-unknown`. It will be ignored.\\n' +\n+ ' in div (at **)',\n+ ]);\n expect(container.firstChild.hasAttribute('on-unknown')).toBe(false);\n expect(container.firstChild['on-unknown']).toBe(undefined);\n });\n@@ -295,13 +297,13 @@ describe('ReactDOMComponent', () => {\n it('should warn for badly cased React attributes', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

);\n- });\n- }).toErrorDev(\n- 'Invalid DOM property `CHILDREN`. Did you mean `children`?\\n in div (at **)',\n- );\n+ await act(() => {\n+ root.render(

);\n+ });\n+ assertConsoleErrorDev([\n+ 'Invalid DOM property `CHILDREN`. Did you mean `children`?\\n' +\n+ ' in div (at **)',\n+ ]);\n expect(container.firstChild.getAttribute('CHILDREN')).toBe('5');\n });\n \n@@ -323,14 +325,13 @@ describe('ReactDOMComponent', () => {\n const style = {fontSize: NaN};\n const div = document.createElement('div');\n const root = ReactDOMClient.createRoot(div);\n- await expect(async () => {\n- await act(() => {\n- root.render();\n- });\n- }).toErrorDev(\n- '`NaN` is an invalid value for the `fontSize` css style property.' +\n- '\\n in span (at **)',\n- );\n+ await act(() => {\n+ root.render();\n+ });\n+ assertConsoleErrorDev([\n+ '`NaN` is an invalid value for the `fontSize` css style property.\\n' +\n+ ' in span (at **)',\n+ ]);\n await act(() => {\n root.render();\n });\n@@ -350,15 +351,18 @@ describe('ReactDOMComponent', () => {\n const style = {fontSize: new TemporalLike()};\n const root = ReactDOMClient.createRoot(document.createElement('div'));\n await expect(async () => {\n- await expect(async () => {\n- await act(() => {\n- root.render();\n- });\n- }).toErrorDev(\n- 'The provided `fontSize` CSS property is an unsupported type TemporalLike.' +\n- ' This value must be coerced to a string before using it here.',\n- );\n+ await act(() => {\n+ root.render();\n+ });\n }).rejects.toThrowError(new TypeError('prod message'));\n+ assertConsoleErrorDev([\n+ 'The provided `fontSize` CSS property is an unsupported type TemporalLike.' +\n+ ' This value must be coerced to a string before using it here.\\n' +\n+ ' in span (at **)',\n+ 'The provided `fontSize` CSS property is an unsupported type TemporalLike.' +\n+ ' This value must be coerced to a string before using it here.\\n' +\n+ ' in span (at **)',\n+ ]);\n });\n \n it('should update styles if initially null', async () => {\n@@ -590,16 +594,16 @@ describe('ReactDOMComponent', () => {\n it('should not add an empty src attribute', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render(

);\n- });\n- }).toErrorDev(\n+ await act(() => {\n+ root.render(

);\n+ });\n+ assertConsoleErrorDev([\n 'An empty string (\"\") was passed to the src attribute. ' +\n 'This may cause the browser to download the whole page again over the network. ' +\n 'To fix this, either do not render the element at all ' +\n- 'or pass null to src instead of an empty string.',\n- );\n+ 'or pass null to src instead of an empty string.\\n' +\n+ ' in img (at **)',\n+ ]);\n expect(node.hasAttribute('src')).toBe(false);\n });\n \n it('should not add an empty href attribute', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render();\n- });\n- }).toErrorDev(\n+ await act(() => {\n+ root.render();\n+ });\n+ assertConsoleErrorDev([\n 'An empty string (\"\") was passed to the href attribute. ' +\n 'To fix this, either do not render the element at all ' +\n- 'or pass null to href instead of an empty string.',\n- );\n+ 'or pass null to href instead of an empty string.\\n' +\n+ ' in link (at **)',\n+ ]);\n const node = container.firstChild;\n expect(node.hasAttribute('href')).toBe(false);\n \n@@ -641,15 +645,15 @@ describe('ReactDOMComponent', () => {\n });\n expect(node.hasAttribute('href')).toBe(true);\n \n- await expect(async () => {\n- await act(() => {\n- root.render();\n- });\n- }).toErrorDev(\n+ await act(() => {\n+ root.render();\n+ });\n+ assertConsoleErrorDev([\n 'An empty string (\"\") was passed to the href attribute. ' +\n 'To fix this, either do not render the element at all ' +\n- 'or pass null to href instead of an empty string.',\n- );\n+ 'or pass null to href instead of an empty string.\\n' +\n+ ' in link (at **)',\n+ ]);\n expect(node.hasAttribute('href')).toBe(false);\n });\n \n@@ -871,204 +875,235 @@ describe('ReactDOMComponent', () => {\n });\n \n it('should reject attribute key injection attack on markup for regular DOM (SSR)', () => {\n- expect(() => {\n- for (let i = 0; i < 3; i++) {\n- const element1 = React.createElement(\n- 'div',\n- {'blah\" onclick=\"beevil\" noise=\"hi': 'selected'},\n- null,\n- );\n- const element2 = React.createElement(\n- 'div',\n- {'><\/div>

dillon1000/react

Files changed