[Tests] test improvements

Author: ljharb

packages/enzyme-test-suite/test/ReactWrapper-spec.jsx

@@ -1171,15 +1171,17 @@ describeWithDOM('mount', () => {
       const SuspenseComponent = () => (
         <Suspense fallback={<Fallback />}>
           <div />
-          <div />
+          <span />
+          <main />
         </Suspense>
       );
 
       const wrapper = mount(<SuspenseComponent />);
       expect(wrapper.debug()).to.equal(`<SuspenseComponent>
   <Suspense fallback={{...}}>
     <div />
-    <div />
+    <span />
+    <main />
   </Suspense>
 </SuspenseComponent>`);
     });

packages/enzyme-test-suite/test/_helpers/setupAdapters.js

@@ -1,3 +1,4 @@
+const util = require('util');
 const Enzyme = require('enzyme');
 const wrap = require('mocha-wrap');
 // eslint-disable-next-line prefer-destructuring
@@ -12,12 +13,14 @@ const origError = console.error;
 wrap.register(function withConsoleThrows() {
   return this.withOverrides(() => console, () => ({
     error(msg) {
-      origError.apply(console, arguments); // eslint-disable-line prefer-rest-params
-      throw new EvalError(msg);
+      /* eslint prefer-rest-params: 1 */
+      origError.apply(console, arguments);
+      throw new EvalError(arguments.length > 1 ? util.format.apply(util, arguments) : msg);
     },
     warn(msg) {
-      origWarn.apply(console, arguments); // eslint-disable-line prefer-rest-params
-      throw new EvalError(msg);
+      /* eslint prefer-rest-params: 1, prefer-spread: 1 */
+      origWarn.apply(console, arguments);
+      throw new EvalError(arguments.length > 1 ? util.format.apply(util, arguments) : msg);
     },
   })).extend('with console throws', {
     beforeEach() {

packages/enzyme-test-suite/test/shared/lifecycles/misc.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import sinon from 'sinon-sandbox';
 import { expect } from 'chai';
-import isEqual from 'lodash.isequal';
 import PropTypes from 'prop-types';
 
 import {
@@ -489,7 +488,10 @@ export default function describeMisc({
             && properErrorMessage(error)
             && rest.length === 0);
           expect(third).to.deep.equal(['render']);
-          expect(fourth).to.satisfy(([name, error, info]) => name === 'componentDidCatch' && properErrorMessage(error) && isEqual(info, expectedInfo));
+          const [name, error, info] = fourth;
+          expect(name).to.equal('componentDidCatch');
+          expect(error).to.satisfy(properErrorMessage);
+          expect(info).to.deep.equal(expectedInfo);
 
           expect(stateSpy.args).to.deep.equal([
             [{

packages/enzyme-test-suite/test/shared/methods/debug.jsx

@@ -89,6 +89,7 @@ export default function describeDebug({
         });
 
         it('displays the expected display names', () => {
+          expect(SFCMemoWithDisplayName).to.have.property('displayName');
           const wrapper = Wrap((
             <div>
               <SFC />