Added suppress warning flag for spyOn(console)

Author: bvaughn

packages/react-dom/src/__tests__/utils/ReactDOMServerIntegrationTestUtils.js

@@ -41,7 +41,9 @@ module.exports = function(initModules) {
     if (console.error.calls && console.error.calls.reset) {
       console.error.calls.reset();
     } else {
-      spyOnDev(console, 'error');
+      // TODO: Rewrite tests that use this helper to enumerate expeceted errors.
+      // This will enable the helper to use the .toWarnDev() matcher instead of spying.
+      spyOnDev(console, 'error', true);
     }
 
     const result = await fn();

packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.internal.js

@@ -13,6 +13,13 @@
 let React;
 let ReactNoop;
 
+// NOTE: This test requires traditional spies for console.error verification.
+// The .toWarnDev() matcher treates unexpected warnings as errors.
+// Unfortunately, if an error boundary is active, ReactFiberScheduler swallows
+// any Errors that are thrown synchronously by .toWarnDev().
+// And Errors that are queued to be returned later by the matcher are preempted
+// by the errors intentionally thrown by the Components in this test.
+// This means the matcher could only produce false positives.
 describe('ReactIncrementalErrorLogging', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -25,7 +32,7 @@ describe('ReactIncrementalErrorLogging', () => {
   }
 
   it('should log errors that occur during the begin phase', () => {
-    spyOnDevAndProd(console, 'error');
+    spyOnDevAndProd(console, 'error', true);
 
     class ErrorThrowingComponent extends React.Component {
       componentWillMount() {
@@ -70,7 +77,7 @@ describe('ReactIncrementalErrorLogging', () => {
   });
 
   it('should log errors that occur during the commit phase', () => {
-    spyOnDevAndProd(console, 'error');
+    spyOnDevAndProd(console, 'error', true);
 
     class ErrorThrowingComponent extends React.Component {
       componentDidMount() {
@@ -120,7 +127,7 @@ describe('ReactIncrementalErrorLogging', () => {
     try {
       React = require('react');
       ReactNoop = require('react-noop-renderer');
-      spyOnDevAndProd(console, 'error');
+      spyOnDevAndProd(console, 'error', true);
 
       class ErrorThrowingComponent extends React.Component {
         render() {
@@ -167,7 +174,7 @@ describe('ReactIncrementalErrorLogging', () => {
   });
 
   it('should relay info about error boundary and retry attempts if applicable', () => {
-    spyOnDevAndProd(console, 'error');
+    spyOnDevAndProd(console, 'error', true);
 
     class ParentComponent extends React.Component {
       render() {

scripts/jest/setupTests.js

@@ -20,15 +20,19 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
   const jasmineSpyOn = global.spyOn;
 
   const noop = function() {};
-  const spyOn = function(object, methodName) {
-    if (object === console) {
+  const spyOn = function(object, methodName, ignoreConsoleWarning) {
+    if (
+      object === console &&
+      (methodName === 'warn' || methodName === 'error') &&
+      !ignoreConsoleWarning
+    ) {
       throw new Error(
         'Do not spy on the console directly. ' +
           'Use toWarnDev() or toLowPriorityWarnDev() instead.'
       );
     }
 
-    jasmineSpyOn(object, methodName);
+    return jasmineSpyOn(object, methodName);
   };
 
   // Spying on console methods in production builds can mask errors.