Fix to call componentDidUpdate on setState of React v16

enzymejs · Oct 18, 2017 · ce39a28 · ce39a28
1 parent 9572a3e
commit ce39a28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -3519,15 +3519,13 @@ describe('shallow', () => {
           [
             'render',
           ],
-        ];
-        if (!REACT16) {
-          expected.push([
+          [
             'componentDidUpdate',
             { foo: 'props' }, { foo: 'props' },
             { foo: 'bar' }, { foo: 'baz' },
-            { foo: 'context' },
-          ]);
-        }
+            REACT16 ? undefined : { foo: 'context' },
+          ],
+        ];
         expect(spy.args).to.deep.equal(expected);
       });
 

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -249,7 +249,7 @@ class ShallowWrapper {
 
   /**
    * A method is for re-render with new props and context.
-   * This calls componentDidUpdate method if lifecycleExperimental is enabled.
+   * This calls componentDidUpdate method if disableLifecycleMethods is not enabled.
    *
    * NOTE: can only be called on a wrapper instance that is also the root instance.
    *
@@ -387,7 +387,7 @@ class ShallowWrapper {
         // so we replace shouldComponentUpdate to know the result and restore it later.
         let originalShouldComponentUpdate;
         if (
-          this[OPTIONS].lifecycleExperimental &&
+          !this[OPTIONS].disableLifecycleMethods &&
           adapter.options.enableComponentDidUpdateOnSetState &&
           instance &&
           typeof instance.shouldComponentUpdate === 'function'
@@ -402,7 +402,7 @@ class ShallowWrapper {
         instance.setState(state, callback);
         if (
           shouldRender &&
-          this[OPTIONS].lifecycleExperimental &&
+          !this[OPTIONS].disableLifecycleMethods &&
           adapter.options.enableComponentDidUpdateOnSetState &&
           instance &&
           typeof instance.componentDidUpdate === 'function'