Merge branch 'master' into feat/Profiler

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);
 ```
 
 

docs/guides/react-native.md

@@ -49,7 +49,7 @@ prop, that can be used a selector similar to `className` in standard React:
 expect(wrapper.findWhere(node => node.prop('testID') === 'todo-item')).toExist();
 ```
 
-## Example configuration for Jest
+## Default example configuration for Jest and JSDOM replacement
 
 To perform the necessary configuration in your testing framework, it is recommended to use a setup script,
 such as with Jest's `setupFilesAfterEnv` setting.
@@ -104,23 +104,50 @@ copyProps(window, global);
  * and inspect the DOM in tests.
  */
 Enzyme.configure({ adapter: new Adapter() });
+```
+
+## Configure enzyme with other test libraries and include JSDOM on the fly
+
+Update the file specified in `setupFilesAfterEnv`, in this case `setup-tests.js` in the project root:
+
+```jsx
+import 'react-native';
+import 'jest-enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import Enzyme from 'enzyme';
+
+/**
+ * Set up Enzyme to mount to DOM, simulate events,
+ * and inspect the DOM in tests.
+ */
+Enzyme.configure({ adapter: new Adapter() });
+```
+
+### Create a separate test file
 
+Create a file prefixed with enzyme.test.ts for example `component.enzyme.test.js`:
+
+```jsx
 /**
- * Ignore some expected warnings
- * see: https://jestjs.io/docs/en/tutorial-react.html#snapshot-testing-with-mocks-enzyme-and-react-16
- * see https://github.com/Root-App/react-native-mock-render/issues/6
+ * @jest-environment jsdom
  */
-const originalConsoleError = console.error;
-console.error = (message) => {
-  if (message.startsWith('Warning:')) {
-    return;
-  }
+import React from 'react';
+import { mount } from 'enzyme';
+import { Text } from '../../../component/text';
 
-  originalConsoleError(message);
-};
+describe('Component tested with airbnb enzyme', () => {
+  test('App mount with enzyme', () => {
+    const wrapper = mount(<Text />);
+    // other tests operations
+  });
+});
 ```
 
-You should then be able to start writing tests!
+**The most important part is to ensure that the test runs with the `jestEnvironment` set to `jsdom`** - one way is to include a `/* @jest-environment jsdom */` comment at the top of the file.
+
+
+
+Then you should then be able to start writing tests!
 
 Note that you may want to perform some additional mocking around native components,
 or if you want to perform snapshot testing against React Native components. Notice

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';
@@ -417,26 +417,6 @@ describeWithDOM('mount', () => {
         expect(wrapper.context().name).to.equal(context.name);
         expect(wrapper.context('name')).to.equal(context.name);
       });
-
-      itIf(is('< 16'), 'works with SFCs', () => {
-        const Foo = ({ foo }) => (
-          <div>
-            <div className="bar">bar</div>
-            <div className="qoo">{foo}</div>
-          </div>
-        );
-
-        Foo.contextTypes = {
-          _: PropTypes.string,
-        };
-
-        const wrapper = mount(<Foo foo="qux" />, {
-          context: {
-            _: 'foo',
-          },
-        });
-        expect(wrapper.context('_')).to.equal('foo');
-      });
     });
   });
 
@@ -2768,7 +2748,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
       );
     });
 
@@ -2797,7 +2777,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
         );
       });
     });
@@ -7518,12 +7498,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', () => {
@@ -8997,7 +8977,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';
@@ -284,6 +284,7 @@ describe('shallow', () => {
         );
         SimpleComponent.contextTypes = { name: PropTypes.string };
 
+        const context = { name: 'foo' };
         const wrapper = shallow(<SimpleComponent />, { context });
 
         expect(wrapper.context().name).to.equal(context.name);
@@ -790,11 +791,11 @@ describe('shallow', () => {
 
       expect(() => wrapper.contains({})).to.throw(
         Error,
-        'ShallowWrapper::contains() can only be called with ReactElement (or array of them), string or number as argument.', // eslint-disable-line max-len
+        'ShallowWrapper::contains() can only be called with a ReactElement (or an array of them), a string, or a number as an argument.',
       );
       expect(() => wrapper.contains(() => ({}))).to.throw(
         Error,
-        'ShallowWrapper::contains() can only be called with ReactElement (or array of them), string or number as argument.', // eslint-disable-line max-len
+        'ShallowWrapper::contains() can only be called with a ReactElement (or an array of them), a string, or a number as an argument.',
       );
     });
 
@@ -7727,12 +7728,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;

packages/enzyme/src/ShallowWrapper.js

@@ -747,7 +747,7 @@ class ShallowWrapper {
   contains(nodeOrNodes) {
     const adapter = getAdapter(this[OPTIONS]);
     if (!isReactElementAlike(nodeOrNodes, adapter)) {
-      throw new Error('ShallowWrapper::contains() can only be called with ReactElement (or array of them), string or number as argument.');
+      throw new Error('ShallowWrapper::contains() can only be called with a ReactElement (or an array of them), a string, or a number as an argument.');
     }
     const predicate = Array.isArray(nodeOrNodes)
       ? other => containsChildrenSubArray(

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