Merge branch 'master' into issue1916

Author: sstern6

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

@@ -416,26 +416,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');
-      });
     });
   });
 

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

@@ -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.',
       );
     });
 

packages/enzyme/src/ShallowWrapper.js

@@ -757,7 +757,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(