Merge branch 'master' into master

docs/api/ReactWrapper/reduce.md

@@ -36,8 +36,8 @@ function Foo() {
 
 ```jsx
 const wrapper = mount(<Foo />);
-const total = wrapper.find(Bar).reduce((amount, n) => amount + n.prop('amount'));
-expect(total).to.equal(16);
+const total = wrapper.find(Bar).reduce((amount, n) => amount + n.prop('amount'), 0);
+expect(total).to.equal(14);
 ```
 
 

docs/api/ReactWrapper/reduceRight.md

@@ -36,8 +36,8 @@ function Foo() {
 
 ```jsx
 const wrapper = mount(<Foo />);
-const total = wrapper.find(Bar).reduceRight((amount, n) => amount + n.prop('amount'));
-expect(total).to.equal(16);
+const total = wrapper.find(Bar).reduceRight((amount, n) => amount + n.prop('amount'), 0);
+expect(total).to.equal(14);
 ```
 
 

docs/api/ShallowWrapper/reduce.md

@@ -36,8 +36,8 @@ function Foo() {
 
 ```jsx
 const wrapper = shallow(<Foo />);
-const total = wrapper.find(Bar).reduce((amount, n) => amount + n.prop('amount'));
-expect(total).to.equal(16);
+const total = wrapper.find(Bar).reduce((amount, n) => amount + n.prop('amount'), 0);
+expect(total).to.equal(14);
 ```
 
 

docs/api/ShallowWrapper/reduceRight.md

@@ -36,8 +36,8 @@ function Foo() {
 
 ```jsx
 const wrapper = shallow(<Foo />);
-const total = wrapper.find(Bar).reduceRight((amount, n) => amount + n.prop('amount'));
-expect(total).to.equal(16);
+const total = wrapper.find(Bar).reduceRight((amount, n) => amount + n.prop('amount'), 0);
+expect(total).to.equal(14);
 ```
 
 

packages/enzyme-test-suite/package.json

@@ -31,6 +31,7 @@
   "license": "MIT",
   "dependencies": {
     "chai": "^4.1.2",
+    "create-react-class": "^15.6.3",
     "enzyme": "^3.8.0",
     "enzyme-adapter-utils": "^1.9.1",
     "html-element-map": "^1.0.0",
@@ -40,21 +41,21 @@
     "object-inspect": "^1.6.0",
     "object.assign": "^4.1.0",
     "prop-types": "^15.7.2",
+    "react-is": "^16.8.4",
     "semver": "^5.6.0",
+    "sinon-sandbox": "^2.0.0",
     "sinon": "^5.1.1"
   },
   "peerDependencies": {
     "react": "^15.5.0",
     "react-dom": "^15.5.0"
   },
   "devDependencies": {
-    "create-react-class": "^15.6.3",
     "eslint": "^5.15.1",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-mocha": "^5.2.1",
-    "eslint-plugin-react": "^7.12.4",
-    "react-is": "^16.8.4"
+    "eslint-plugin-react": "^7.12.4"
   }
 }

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

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import React from 'react';
 import wrap from 'mocha-wrap';
-import sinon from 'sinon';
+import sinon from 'sinon-sandbox';
 
 import { mount, shallow } from 'enzyme';
 import { get } from 'enzyme/build/configuration';

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import sinon from 'sinon';
+import sinon from 'sinon-sandbox';
 import { expect } from 'chai';
 import { elementToTree } from 'enzyme-adapter-utils';
 import {

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

@@ -2,7 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinon from 'sinon-sandbox';
 import wrap from 'mocha-wrap';
 import isEqual from 'lodash.isequal';
 import getData from 'html-element-map/getData';
@@ -3141,7 +3141,7 @@ describeWithDOM('mount', () => {
       const wrapper = mount(<SimpleComponent />);
       expect(() => wrapper.setContext({ name: 'bar' })).to.throw(
         Error,
-        'ShallowWrapper::setContext() can only be called on a wrapper that was originally passed a context option', // eslint-disable-line max-len
+        'ReactWrapper::setContext() can only be called on a wrapper that was originally passed a context option', // eslint-disable-line max-len
       );
     });
 
@@ -3170,7 +3170,7 @@ describeWithDOM('mount', () => {
         const wrapper = mount(<SimpleComponent />);
         expect(() => wrapper.setContext({ name: 'bar' })).to.throw(
           Error,
-          'ShallowWrapper::setContext() can only be called on a wrapper that was originally passed a context option', // eslint-disable-line max-len
+          'ReactWrapper::setContext() can only be called on a wrapper that was originally passed a context option', // eslint-disable-line max-len
         );
       });
     });
@@ -7891,12 +7891,12 @@ describeWithDOM('mount', () => {
           }
         }
 
-        const cDU = sinon.spy(DummyComp.prototype, 'componentDidUpdate');
-        const gDSFP = sinon.spy(DummyComp, 'getDerivedStateFromProps');
+        let cDU;
+        let gDSFP;
 
         beforeEach(() => { // eslint-disable-line mocha/no-sibling-hooks
-          cDU.resetHistory();
-          gDSFP.resetHistory();
+          cDU = sinon.spy(DummyComp.prototype, 'componentDidUpdate');
+          gDSFP = sinon.spy(DummyComp, 'getDerivedStateFromProps');
         });
 
         it('with no state changes, calls both methods with a sync and async setProps', () => {
@@ -9370,7 +9370,7 @@ describeWithDOM('mount', () => {
 
         onChange() {
           // enzyme can't handle the update because `this` is a ReactComponent instance,
-          // not a ShallowWrapper instance.
+          // not a Wrapper instance.
           this.setState({ foo: 'onChange update' });
         }
 

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { expect } from 'chai';
-import sinon from 'sinon';
+import sinon from 'sinon-sandbox';
 import wrap from 'mocha-wrap';
 import isEqual from 'lodash.isequal';
 import getData from 'html-element-map/getData';
@@ -8164,12 +8164,12 @@ describe('shallow', () => {
           }
         }
 
-        const cDU = sinon.spy(DummyComp.prototype, 'componentDidUpdate');
-        const gDSFP = sinon.spy(DummyComp, 'getDerivedStateFromProps');
+        let cDU;
+        let gDSFP;
 
         beforeEach(() => { // eslint-disable-line mocha/no-sibling-hooks
-          cDU.resetHistory();
-          gDSFP.resetHistory();
+          cDU = sinon.spy(DummyComp.prototype, 'componentDidUpdate');
+          gDSFP = sinon.spy(DummyComp, 'getDerivedStateFromProps');
         });
 
         it('with no state changes, calls both methods with a sync and async setProps', () => {

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { expect } from 'chai';
 import wrap from 'mocha-wrap';
-import sinon from 'sinon';
+import sinon from 'sinon-sandbox';
 import {
   childrenToSimplifiedArray,
   nodeEqual,

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

@@ -0,0 +1,5 @@
+import sinon from 'sinon-sandbox';
+
+beforeEach(() => { // eslint-disable-line mocha/no-top-level-hooks
+  sinon.restore();
+});

packages/enzyme/src/ReactWrapper.js

@@ -353,7 +353,7 @@ class ReactWrapper {
       throw new Error('ReactWrapper::setContext() can only be called on the root');
     }
     if (!this[OPTIONS].context) {
-      throw new Error('ShallowWrapper::setContext() can only be called on a wrapper that was originally passed a context option');
+      throw new Error('ReactWrapper::setContext() can only be called on a wrapper that was originally passed a context option');
     }
     this[RENDERER].render(this[UNRENDERED], context, () => this.update());
     return this;

test/mocha.opts

@@ -1,3 +1,3 @@
---require ./packages/enzyme/withDom.js ./packages/enzyme-test-suite/test/_helpers/setupAdapters.js
+--require ./packages/enzyme/withDom.js ./packages/enzyme-test-suite/test/_helpers/setupAdapters.js ./packages/enzyme-test-suite/test/_helpers/beforeEach.js
 --compilers js:babel-core/register,jsx:babel-core/register
 --extensions js,jsx