Ignore both versions in DevTools test that might assert on multiple R…

…eact
facebook · Jun 10, 2024 · ae2ae01 · ae2ae01
1 parent 06117aa
commit ae2ae01
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/packages/react-devtools-shared/src/__tests__/inspectedElement-test.js b/packages/react-devtools-shared/src/__tests__/inspectedElement-test.js
@@ -2556,7 +2556,7 @@ describe('InspectedElement', () => {
       };
 
       await withErrorsOrWarningsIgnored(
-        ['Warning: Each child in a list should have a unique "key" prop.'],
+        ['Each child in a list should have a unique "key" prop.'],
         async () => {
           await utils.actAsync(() =>
             render(<Example repeatWarningCount={1} />),

diff --git a/packages/react-devtools-shared/src/__tests__/setupTests.js b/packages/react-devtools-shared/src/__tests__/setupTests.js
@@ -154,23 +154,22 @@ beforeEach(() => {
 
   const originalConsoleError = console.error;
   console.error = (...args) => {
-    const firstArg = args[0];
-    if (
-      firstArg === 'Warning: React instrumentation encountered an error: %s'
-    ) {
+    let firstArg = args[0];
+    if (typeof firstArg === 'string' && firstArg.startsWith('Warning: ')) {
+      // Older React versions might use the Warning: prefix. I'm not sure
+      // if they use this code path.
+      firstArg = firstArg.slice(9);
+    }
+    if (firstArg === 'React instrumentation encountered an error: %s') {
       // Rethrow errors from React.
       throw args[1];
     } else if (
       typeof firstArg === 'string' &&
-      (firstArg.startsWith(
-        "Warning: It looks like you're using the wrong act()",
-      ) ||
+      (firstArg.startsWith("It looks like you're using the wrong act()") ||
         firstArg.startsWith(
-          'Warning: The current testing environment is not configured to support act',
+          'The current testing environment is not configured to support act',
         ) ||
-        firstArg.startsWith(
-          'Warning: You seem to have overlapping act() calls',
-        ))
+        firstArg.startsWith('You seem to have overlapping act() calls'))
     ) {
       // DevTools intentionally wraps updates with acts from both DOM and test-renderer,
       // since test updates are expected to impact both renderers.

diff --git a/packages/react-devtools-shared/src/__tests__/store-test.js b/packages/react-devtools-shared/src/__tests__/store-test.js
@@ -1927,7 +1927,7 @@ describe('Store', () => {
       }
 
       withErrorsOrWarningsIgnored(
-        ['Warning: Each child in a list should have a unique "key" prop'],
+        ['Each child in a list should have a unique "key" prop'],
         () => {
           act(() => render(<Example />));
         },
@@ -1952,7 +1952,7 @@ describe('Store', () => {
       }
 
       withErrorsOrWarningsIgnored(
-        ['Warning: Each child in a list should have a unique "key" prop'],
+        ['Each child in a list should have a unique "key" prop'],
         () => {
           act(() => render(<Example />));
         },

diff --git a/packages/react-devtools-shell/src/app/index.js b/packages/react-devtools-shell/src/app/index.js
@@ -32,8 +32,18 @@ ignoreErrors([
   'Warning: %s is deprecated in StrictMode.', // findDOMNode
   'Warning: ReactDOM.render was removed in React 19',
   'Warning: react-test-renderer is deprecated',
+  // Ignore prefixed and not prefixed since I don't know which
+  // React versions are being tested by this code.
+  'Legacy context API',
+  'Unsafe lifecycle methods',
+  '%s is deprecated in StrictMode.', // findDOMNode
+  'ReactDOM.render was removed in React 19',
+  'react-test-renderer is deprecated',
+]);
+ignoreWarnings([
+  'Warning: componentWillReceiveProps has been renamed',
+  'componentWillReceiveProps has been renamed',
 ]);
-ignoreWarnings(['Warning: componentWillReceiveProps has been renamed']);
 ignoreLogs([]);
 
 const unmountFunctions: Array<() => void | boolean> = [];