Breaking: lifecycleExperimental as the default option

enzymejs · Sep 23, 2017 · e8296d7 · e8296d7
1 parent f62b6c0
commit e8296d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -3185,7 +3185,6 @@ describe('shallow', () => {
           <Foo foo="bar" />,
           {
             context: { foo: 'context' },
-            lifecycleExperimental: true,
           },
         );
         wrapper.setProps({ foo: 'baz' });
@@ -3275,7 +3274,7 @@ describe('shallow', () => {
           }
         }
 
-        const wrapper = shallow(<Foo a="a" b="b" />, { lifecycleExperimental: true });
+        const wrapper = shallow(<Foo a="a" b="b" />);
 
         wrapper.setProps({ b: 'c', d: 'e' });
 
@@ -3326,7 +3325,7 @@ describe('shallow', () => {
           }
         }
 
-        const wrapper = shallow(<Foo foo="bar" />, { lifecycleExperimental: true });
+        const wrapper = shallow(<Foo foo="bar" />);
         expect(wrapper.instance().props.foo).to.equal('bar');
         wrapper.setProps({ foo: 'baz' });
         expect(wrapper.instance().props.foo).to.equal('baz');
@@ -3359,7 +3358,7 @@ describe('shallow', () => {
             return <div>{this.props.foo}</div>;
           }
         }
-        const result = shallow(<Foo />, { lifecycleExperimental: true });
+        const result = shallow(<Foo />);
         expect(spy).to.have.property('callCount', 1);
         result.setProps({ name: 'bar' });
         expect(spy).to.have.property('callCount', 2);
@@ -3388,7 +3387,7 @@ describe('shallow', () => {
             return <div>{this.props.foo}</div>;
           }
         }
-        const result = shallow(<Foo />, { lifecycleExperimental: true });
+        const result = shallow(<Foo />);
         expect(spy).to.have.property('callCount', 1);
         result.setProps({ name: 'bar' });
         expect(spy).to.have.property('callCount', 3);
@@ -3419,7 +3418,7 @@ describe('shallow', () => {
             return <div>{this.props.foo}</div>;
           }
         }
-        const result = shallow(<Foo />, { lifecycleExperimental: true });
+        const result = shallow(<Foo />);
         expect(spy).to.have.property('callCount', 1);
         result.setProps({ name: 'bar' });
         expect(spy).to.have.property('callCount', 3);
@@ -3463,7 +3462,6 @@ describe('shallow', () => {
           <Foo foo="props" />,
           {
             context: { foo: 'context' },
-            lifecycleExperimental: true,
           },
         );
         wrapper.setState({ foo: 'baz' });
@@ -3519,7 +3517,7 @@ describe('shallow', () => {
             return <div>foo</div>;
           }
         }
-        const wrapper = shallow(<Foo />, { lifecycleExperimental: true });
+        const wrapper = shallow(<Foo />);
         expect(wrapper.instance().state.foo).to.equal('bar');
         wrapper.setState({ foo: 'baz' });
         expect(wrapper.instance().state.foo).to.equal('baz');
@@ -3549,7 +3547,7 @@ describe('shallow', () => {
             return <div>{this.state.name}</div>;
           }
         }
-        const result = shallow(<Foo />, { lifecycleExperimental: true });
+        const result = shallow(<Foo />);
         expect(spy).to.have.property('callCount', 1);
         result.setState({ name: 'bar' });
         expect(spy).to.have.property('callCount', 3);
@@ -3581,7 +3579,7 @@ describe('shallow', () => {
             return <div>{this.state.name}</div>;
           }
         }
-        const result = shallow(<Foo />, { lifecycleExperimental: true });
+        const result = shallow(<Foo />);
         expect(spy).to.have.property('callCount', 1);
         result.setState({ name: 'bar' });
         expect(spy).to.have.property('callCount', 3);
@@ -3621,7 +3619,6 @@ describe('shallow', () => {
           <Foo foo="props" />,
           {
             context: { foo: 'bar' },
-            lifecycleExperimental: true,
           },
         );
         expect(wrapper.instance().context.foo).to.equal('bar');
@@ -3680,7 +3677,6 @@ describe('shallow', () => {
           <Foo />,
           {
             context: { foo: 'bar' },
-            lifecycleExperimental: true,
           },
         );
         wrapper.setContext({ foo: 'baz' });
@@ -3713,7 +3709,6 @@ describe('shallow', () => {
           <Foo />,
           {
             context: { foo: 'bar' },
-            lifecycleExperimental: true,
           },
         );
         expect(spy).to.have.property('callCount', 1);
@@ -3750,7 +3745,6 @@ describe('shallow', () => {
           <Foo />,
           {
             context: { foo: 'bar' },
-            lifecycleExperimental: true,
           },
         );
         expect(spy).to.have.property('callCount', 1);
@@ -3771,13 +3765,13 @@ describe('shallow', () => {
             return <div>foo</div>;
           }
         }
-        const wrapper = shallow(<Foo />, { lifecycleExperimental: true });
+        const wrapper = shallow(<Foo />);
         wrapper.unmount();
         expect(spy).to.have.property('callCount', 1);
       });
     });
 
-    it('should not call when lifecycleExperimental flag is false', () => {
+    it('should not call when disableLifecycleMethods flag is true', () => {
       const spy = sinon.spy();
       class Foo extends React.Component {
         componentDidMount() {
@@ -3787,11 +3781,11 @@ describe('shallow', () => {
           return <div>foo</div>;
         }
       }
-      shallow(<Foo />, { lifecycleExperimental: false });
+      shallow(<Foo />, { disableLifecycleMethods: true });
       expect(spy).to.have.property('callCount', 0);
     });
 
-    it('should call shouldComponentUpdate when lifecycleExperimental flag is false', () => {
+    it('should call shouldComponentUpdate when disableLifecycleMethods flag is true', () => {
       const spy = sinon.spy();
       class Foo extends React.Component {
         constructor(props) {
@@ -3812,7 +3806,7 @@ describe('shallow', () => {
         <Foo foo="foo" />,
         {
           context: { foo: 'foo' },
-          lifecycleExperimental: false,
+          disableLifecycleMethods: true,
         },
       );
       expect(spy).to.have.property('callCount', 0);

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -118,7 +118,7 @@ class ShallowWrapper {
       this[RENDERER].render(nodes, options.context);
       const instance = this[RENDERER].getNode().instance;
       if (
-        options.lifecycleExperimental &&
+        !options.disableLifecycleMethods &&
         instance &&
         typeof instance.componentDidMount === 'function'
       ) {
@@ -277,7 +277,7 @@ class ShallowWrapper {
           // make sure that componentWillReceiveProps is called before shouldComponentUpdate
           let originalComponentWillReceiveProps;
           if (
-            this[OPTIONS].lifecycleExperimental &&
+            !this[OPTIONS].disableLifecycleMethods &&
             instance &&
             typeof instance.componentWillReceiveProps === 'function'
           ) {
@@ -288,7 +288,7 @@ class ShallowWrapper {
           // dirty hack: avoid calling shouldComponentUpdate twice
           let originalShouldComponentUpdate;
           if (
-            this[OPTIONS].lifecycleExperimental &&
+            !this[OPTIONS].disableLifecycleMethods &&
             instance &&
             typeof instance.shouldComponentUpdate === 'function'
           ) {
@@ -307,7 +307,7 @@ class ShallowWrapper {
               instance.shouldComponentUpdate = originalShouldComponentUpdate;
             }
             if (
-              this[OPTIONS].lifecycleExperimental &&
+              !this[OPTIONS].disableLifecycleMethods &&
               instance &&
               typeof instance.componentDidUpdate === 'function'
             ) {