{"parents":["bd76ce54d93153cc84d861bd59e906bc28e1c160"],"body":"Starting to convert the rest of tests to the `assertConsoleTypeDev`\nhelpers.","files":[{"status":"M","path":"packages\/internal-test-utils\/consoleMock.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/forwardRef-test.js"}],"commit":{"authorName":"Ricky","revision":"8f92ea467e2672a436e3e032299d5230d03187ed","authorEmail":"rickhanlonii@gmail.com","shortRevision":"8f92ea467e","authoredAt":"2024-12-19T11:50:05-05:00","subject":"[assert helpers] forwardRef-test (#31843)"},"patch":"diff --git a\/packages\/internal-test-utils\/consoleMock.js b\/packages\/internal-test-utils\/consoleMock.js\nindex 6d03c74c1d..561004a4de 100644\n--- a\/packages\/internal-test-utils\/consoleMock.js\n+++ b\/packages\/internal-test-utils\/consoleMock.js\n@@ -273,6 +273,7 @@ function normalizeCodeLocInfo(str) {\n \/\/ We strip that out in our normalization to make it look more like component stacks.\n name = name.slice(0, name.length - 7);\n }\n+ name = name.replace(\/.*\\\/([^\\\/]+):\\d+:\\d+\/, '**\/$1:**:**');\n return '\\n in ' + name + ' (at **)';\n });\n }\ndiff --git a\/packages\/react\/src\/__tests__\/forwardRef-test.js b\/packages\/react\/src\/__tests__\/forwardRef-test.js\nindex f0f3bb4d50..e08990c806 100644\n--- a\/packages\/react\/src\/__tests__\/forwardRef-test.js\n+++ b\/packages\/react\/src\/__tests__\/forwardRef-test.js\n@@ -13,6 +13,7 @@ describe('forwardRef', () => {\n let React;\n let ReactNoop;\n let waitForAll;\n+ let assertConsoleErrorDev;\n \n beforeEach(() => {\n jest.resetModules();\n@@ -21,6 +22,7 @@ describe('forwardRef', () => {\n \n const InternalTestUtils = require('internal-test-utils');\n waitForAll = InternalTestUtils.waitForAll;\n+ assertConsoleErrorDev = InternalTestUtils.assertConsoleErrorDev;\n });\n \n it('should update refs when switching between children', async () => {\n@@ -114,25 +116,31 @@ describe('forwardRef', () => {\n });\n \n it('should warn if not provided a callback during creation', () => {\n- expect(() => React.forwardRef(undefined)).toErrorDev(\n- 'forwardRef requires a render function but was given undefined.',\n+ React.forwardRef(undefined);\n+ assertConsoleErrorDev(\n+ ['forwardRef requires a render function but was given undefined.'],\n {withoutStack: true},\n );\n- expect(() => React.forwardRef(null)).toErrorDev(\n- 'forwardRef requires a render function but was given null.',\n+\n+ React.forwardRef(null);\n+ assertConsoleErrorDev(\n+ ['forwardRef requires a render function but was given null.'],\n {\n withoutStack: true,\n },\n );\n- expect(() => React.forwardRef('foo')).toErrorDev(\n- 'forwardRef requires a render function but was given string.',\n+\n+ React.forwardRef('foo');\n+ assertConsoleErrorDev(\n+ ['forwardRef requires a render function but was given string.'],\n {withoutStack: true},\n );\n });\n \n it('should warn if no render function is provided', () => {\n- expect(React.forwardRef).toErrorDev(\n- 'forwardRef requires a render function but was given undefined.',\n+ React.forwardRef();\n+ assertConsoleErrorDev(\n+ ['forwardRef requires a render function but was given undefined.'],\n {withoutStack: true},\n );\n });\n@@ -143,9 +151,12 @@ describe('forwardRef', () => {\n }\n renderWithDefaultProps.defaultProps = {};\n \n- expect(() => React.forwardRef(renderWithDefaultProps)).toErrorDev(\n- 'forwardRef render functions do not support defaultProps. ' +\n- 'Did you accidentally pass a React component?',\n+ React.forwardRef(renderWithDefaultProps);\n+ assertConsoleErrorDev(\n+ [\n+ 'forwardRef render functions do not support defaultProps. ' +\n+ 'Did you accidentally pass a React component?',\n+ ],\n {withoutStack: true},\n );\n });\n@@ -159,9 +170,12 @@ describe('forwardRef', () => {\n it('should warn if the render function provided does not use the forwarded ref parameter', () => {\n const arityOfOne = props =>

;\n \n- expect(() => React.forwardRef(arityOfOne)).toErrorDev(\n- 'forwardRef render functions accept exactly two parameters: props and ref. ' +\n- 'Did you forget to use the ref parameter?',\n+ React.forwardRef(arityOfOne);\n+ assertConsoleErrorDev(\n+ [\n+ 'forwardRef render functions accept exactly two parameters: props and ref. ' +\n+ 'Did you forget to use the ref parameter?',\n+ ],\n {withoutStack: true},\n );\n });\n@@ -174,9 +188,12 @@ describe('forwardRef', () => {\n it('should warn if the render function provided expects to use more than two parameters', () => {\n const arityOfThree = (props, ref, x) =>

;\n \n- expect(() => React.forwardRef(arityOfThree)).toErrorDev(\n- 'forwardRef render functions accept exactly two parameters: props and ref. ' +\n- 'Any additional parameter will be undefined.',\n+ React.forwardRef(arityOfThree);\n+ assertConsoleErrorDev(\n+ [\n+ 'forwardRef render functions accept exactly two parameters: props and ref. ' +\n+ 'Any additional parameter will be undefined.',\n+ ],\n {withoutStack: true},\n );\n });\n@@ -190,15 +207,16 @@ describe('forwardRef', () => {\n \n <\/p>,\n );\n- await expect(async () => {\n- await waitForAll([]);\n- }).toErrorDev(\n+ await waitForAll([]);\n+ assertConsoleErrorDev([\n 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the top-level render call using . It was passed a child from ForwardRef. ' +\n 'See https:\/\/react.dev\/link\/warning-keys for more information.\\n' +\n ' in span (at **)\\n' +\n- ' in ',\n- );\n+ (gate(flags => flags.enableOwnerStacks)\n+ ? ' in **\/forwardRef-test.js:**:** (at **)'\n+ : ' in p (at **)'),\n+ ]);\n });\n \n it('should use the inner function name for the stack', async () => {\n@@ -210,16 +228,16 @@ describe('forwardRef', () => {\n \n <\/p>,\n );\n- await expect(async () => {\n- await waitForAll([]);\n- }).toErrorDev(\n+\n+ await waitForAll([]);\n+ assertConsoleErrorDev([\n 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the top-level render call using . It was passed a child from ForwardRef(Inner). ' +\n 'See https:\/\/react.dev\/link\/warning-keys for more information.\\n' +\n ' in span (at **)\\n' +\n ' in Inner (at **)' +\n (gate(flags => flags.enableOwnerStacks) ? '' : '\\n in p (at **)'),\n- );\n+ ]);\n });\n \n it('should use the inner name in the stack', async () => {\n@@ -233,16 +251,15 @@ describe('forwardRef', () => {\n \n <\/p>,\n );\n- await expect(async () => {\n- await waitForAll([]);\n- }).toErrorDev(\n+ await waitForAll([]);\n+ assertConsoleErrorDev([\n 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the top-level render call using . It was passed a child from ForwardRef(Inner). ' +\n 'See https:\/\/react.dev\/link\/warning-keys for more information.\\n' +\n ' in span (at **)\\n' +\n ' in Inner (at **)' +\n (gate(flags => flags.enableOwnerStacks) ? '' : '\\n in p (at **)'),\n- );\n+ ]);\n });\n \n it('can use the outer displayName in the stack', async () => {\n@@ -255,16 +272,15 @@ describe('forwardRef', () => {\n \n <\/p>,\n );\n- await expect(async () => {\n- await waitForAll([]);\n- }).toErrorDev(\n+ await waitForAll([]);\n+ assertConsoleErrorDev([\n 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the top-level render call using . It was passed a child from Outer. ' +\n 'See https:\/\/react.dev\/link\/warning-keys for more information.\\n' +\n ' in span (at **)\\n' +\n ' in Outer (at **)' +\n (gate(flags => flags.enableOwnerStacks) ? '' : '\\n in p (at **)'),\n- );\n+ ]);\n });\n \n it('should prefer the inner name to the outer displayName in the stack', async () => {\n@@ -279,16 +295,15 @@ describe('forwardRef', () => {\n \n <\/p>,\n );\n- await expect(async () => {\n- await waitForAll([]);\n- }).toErrorDev(\n+ await waitForAll([]);\n+ assertConsoleErrorDev([\n 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the top-level render call using . It was passed a child from Outer. ' +\n 'See https:\/\/react.dev\/link\/warning-keys for more information.\\n' +\n ' in span (at **)\\n' +\n ' in Inner (at **)' +\n (gate(flags => flags.enableOwnerStacks) ? '' : '\\n in p (at **)'),\n- );\n+ ]);\n });\n \n it('should not bailout if forwardRef is not wrapped in memo', async () => {\n@@ -419,13 +434,12 @@ describe('forwardRef', () => {\n });\n \n it('warns on forwardRef(memo(...))', () => {\n- expect(() => {\n- React.forwardRef(\n- React.memo((props, ref) => {\n- return null;\n- }),\n- );\n- }).toErrorDev(\n+ React.forwardRef(\n+ React.memo((props, ref) => {\n+ return null;\n+ }),\n+ );\n+ assertConsoleErrorDev(\n [\n 'forwardRef requires a render function but received a `memo` ' +\n 'component. Instead of forwardRef(memo(...)), use ' +\n"}

dillon1000/react

Files changed