Special case tests

facebook · Apr 10, 2020 · 1352994 · 1352994
1 parent dbc3756
commit 1352994
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 16 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -1724,16 +1724,26 @@ describe('ReactDOMComponent', () => {
             <tr />
           </div>,
         );
-      }).toErrorDev([
-        'Warning: validateDOMNesting(...): <tr> cannot appear as a child of ' +
-          '<div>.' +
-          '\n    in tr (at **)' +
-          '\n    in div (at **)',
-        'Warning: validateDOMNesting(...): <tr> cannot appear as a child of ' +
-          '<div>.' +
-          '\n    in tr (at **)' +
-          '\n    in div (at **)',
-      ]);
+      }).toErrorDev(
+        ReactFeatureFlags.enableComponentStackLocations
+          ? [
+              // This warning dedupes since they're in the same component.
+              'Warning: validateDOMNesting(...): <tr> cannot appear as a child of ' +
+                '<div>.' +
+                '\n    in tr (at **)' +
+                '\n    in div (at **)',
+            ]
+          : [
+              'Warning: validateDOMNesting(...): <tr> cannot appear as a child of ' +
+                '<div>.' +
+                '\n    in tr (at **)' +
+                '\n    in div (at **)',
+              'Warning: validateDOMNesting(...): <tr> cannot appear as a child of ' +
+                '<div>.' +
+                '\n    in tr (at **)' +
+                '\n    in div (at **)',
+            ],
+      );
     });
 
     it('warns on invalid nesting at root', () => {

diff --git a/packages/react-reconciler/src/__tests__/ReactFragment-test.js b/packages/react-reconciler/src/__tests__/ReactFragment-test.js
@@ -10,6 +10,7 @@
 'use strict';
 
 let React;
+let ReactFeatureFlags;
 let ReactNoop;
 let Scheduler;
 
@@ -18,6 +19,7 @@ describe('ReactFragment', () => {
     jest.resetModules();
 
     React = require('react');
+    ReactFeatureFlags = require('shared/ReactFeatureFlags');
     ReactNoop = require('react-noop-renderer');
     Scheduler = require('scheduler');
   });
@@ -900,17 +902,27 @@ describe('ReactFragment', () => {
     );
 
     ReactNoop.render(<Foo condition={false} />);
-    expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(
-      'Each child in a list should have a unique "key" prop.',
-    );
+    if (ReactFeatureFlags.enableComponentStackLocations) {
+      // The key warning gets deduped because it's in the same component.
+      expect(Scheduler).toFlushWithoutYielding();
+    } else {
+      expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(
+        'Each child in a list should have a unique "key" prop.',
+      );
+    }
 
     expect(ops).toEqual(['Update Stateful']);
     expect(ReactNoop.getChildren()).toEqual([span(), div()]);
 
     ReactNoop.render(<Foo condition={true} />);
-    expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(
-      'Each child in a list should have a unique "key" prop.',
-    );
+    if (ReactFeatureFlags.enableComponentStackLocations) {
+      // The key warning gets deduped because it's in the same component.
+      expect(Scheduler).toFlushWithoutYielding();
+    } else {
+      expect(() => expect(Scheduler).toFlushWithoutYielding()).toErrorDev(
+        'Each child in a list should have a unique "key" prop.',
+      );
+    }
 
     expect(ops).toEqual(['Update Stateful', 'Update Stateful']);
     expect(ReactNoop.getChildren()).toEqual([span(), div()]);

diff --git a/packages/shared/__tests__/describeComponentFrame-test.js b/packages/shared/__tests__/describeComponentFrame-test.js
@@ -11,13 +11,19 @@
 
 let React;
 let ReactDOM;
+const ReactFeatureFlags = require('shared/ReactFeatureFlags');
 
 describe('Component stack trace displaying', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
   });
 
+  if (ReactFeatureFlags.enableComponentStackLocations) {
+    it("empty test so Jest doesn't complain", () => {});
+    return;
+  }
+
   it('should provide filenames in stack traces', () => {
     class Component extends React.Component {
       render() {