[enzyme-adapter-react-{16,16.3,16.2,16.1}] [fix] .setContext(): cal…

…ls cWRP Fixes #2258
enzymejs · Nov 13, 2020 · 34828de · 34828de
1 parent 2dbc816
commit 34828de
Show file tree

Hide file tree

Showing 12 changed files with 262 additions and 38 deletions.
diff --git a/packages/enzyme-adapter-react-14/package.json b/packages/enzyme-adapter-react-14/package.json
@@ -39,6 +39,7 @@
   "license": "MIT",
   "dependencies": {
     "enzyme-adapter-utils": "^1.14.0",
+    "enzyme-shallow-equal": "^1.0.4",
     "object.assign": "^4.1.0",
     "object.values": "^1.1.1",
     "prop-types": "^15.7.2",

diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -23,7 +23,9 @@ import {
   getNodeFromRootFinder,
   wrapWithWrappingComponent,
   getWrappingComponentMountRenderer,
+  spyMethod,
 } from 'enzyme-adapter-utils';
+import shallowEqual from 'enzyme-shallow-equal';
 
 function typeToNodeType(type) {
   if (typeof type === 'function') {
@@ -172,6 +174,51 @@ class ReactFourteenAdapter extends EnzymeAdapter {
           isDOM = true;
         } else {
           isDOM = false;
+
+          const inst = renderer._instance;
+          if (inst) {
+            const { restore: restoreUpdateComponent } = spyMethod(
+              inst,
+              'updateComponent',
+              (originalUpadateComponentMethod) => function updateComponent(
+                transaction,
+                prevParentElement,
+                nextParentElement,
+                prevUnmaskedContext,
+                nextUnmaskedContext,
+              ) {
+                if (prevParentElement === nextParentElement) {
+                  const { restore: restoreProcessPendingState } = spyMethod(
+                    inst,
+                    '_processPendingState',
+                    (originalProcessPendingStateMethod) => function _processPendingState(nextProps, nextContext) {
+                      if (!shallowEqual(prevUnmaskedContext, nextUnmaskedContext)) {
+                        if (inst._instance.componentWillReceiveProps) {
+                          inst._instance.componentWillReceiveProps(nextProps, nextContext);
+                        }
+                      }
+
+                      const result = originalProcessPendingStateMethod.call(inst, nextProps, nextContext);
+                      restoreProcessPendingState();
+                      return result;
+                    },
+                  );
+                }
+
+                const result = originalUpadateComponentMethod.call(
+                  inst,
+                  transaction,
+                  prevParentElement,
+                  nextParentElement,
+                  prevUnmaskedContext,
+                  nextUnmaskedContext,
+                );
+                restoreUpdateComponent();
+                return result;
+              },
+            );
+          }
+
           return withSetStateAllowed(() => renderer.render(el, context));
         }
       },

diff --git a/packages/enzyme-adapter-react-16.1/package.json b/packages/enzyme-adapter-react-16.1/package.json
@@ -39,6 +39,7 @@
   "license": "MIT",
   "dependencies": {
     "enzyme-adapter-utils": "^1.14.0",
+    "enzyme-shallow-equal": "^1.0.4",
     "object.assign": "^4.1.0",
     "prop-types": "^15.7.2",
     "react-is": "^16.13.1",

diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -16,6 +16,7 @@ import {
   Portal,
 } from 'react-is';
 import { EnzymeAdapter } from 'enzyme';
+import shallowEqual from 'enzyme-shallow-equal';
 import {
   displayNameOfNode,
   elementToTree as utilElementToTree,
@@ -36,6 +37,7 @@ import {
   getNodeFromRootFinder,
   wrapWithWrappingComponent,
   getWrappingComponentMountRenderer,
+  spyMethod,
 } from 'enzyme-adapter-utils';
 import { findCurrentFiberUsingSlowPath } from 'react-reconciler/reflection';
 
@@ -373,6 +375,29 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
             return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
           }
           if (isStateful) {
+            if (
+              renderer._instance
+              && el.props === renderer._instance.props
+              && !shallowEqual(context, renderer._instance.context)
+            ) {
+              const { restore } = spyMethod(
+                renderer,
+                '_updateClassComponent',
+                (originalMethod) => function _updateClassComponent(...args) {
+                  const { props } = renderer._instance;
+                  const clonedProps = { ...props };
+                  renderer._instance.props = clonedProps;
+
+                  const result = originalMethod.apply(renderer, args);
+
+                  renderer._instance.props = props;
+                  restore();
+
+                  return result;
+                },
+              );
+            }
+
             // fix react bug; see implementation of `getEmptyStateValue`
             const emptyStateValue = getEmptyStateValue();
             if (emptyStateValue) {

diff --git a/packages/enzyme-adapter-react-16.2/package.json b/packages/enzyme-adapter-react-16.2/package.json
@@ -39,6 +39,7 @@
   "license": "MIT",
   "dependencies": {
     "enzyme-adapter-utils": "^1.14.0",
+    "enzyme-shallow-equal": "^1.0.4",
     "object.assign": "^4.1.0",
     "object.values": "^1.1.1",
     "prop-types": "^15.7.2",

diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -17,6 +17,7 @@ import {
 } from 'react-is';
 import { EnzymeAdapter } from 'enzyme';
 import { typeOfNode } from 'enzyme/build/Utils';
+import shallowEqual from 'enzyme-shallow-equal';
 import {
   displayNameOfNode,
   elementToTree as utilElementToTree,
@@ -37,6 +38,7 @@ import {
   getNodeFromRootFinder,
   wrapWithWrappingComponent,
   getWrappingComponentMountRenderer,
+  spyMethod,
 } from 'enzyme-adapter-utils';
 import { findCurrentFiberUsingSlowPath } from 'react-reconciler/reflection';
 
@@ -375,6 +377,29 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
             return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
           }
           if (isStateful) {
+            if (
+              renderer._instance
+              && el.props === renderer._instance.props
+              && !shallowEqual(context, renderer._instance.context)
+            ) {
+              const { restore } = spyMethod(
+                renderer,
+                '_updateClassComponent',
+                (originalMethod) => function _updateClassComponent(...args) {
+                  const { props } = renderer._instance;
+                  const clonedProps = { ...props };
+                  renderer._instance.props = clonedProps;
+
+                  const result = originalMethod.apply(renderer, args);
+
+                  renderer._instance.props = props;
+                  restore();
+
+                  return result;
+                },
+              );
+            }
+
             // fix react bug; see implementation of `getEmptyStateValue`
             const emptyStateValue = getEmptyStateValue();
             if (emptyStateValue) {

diff --git a/packages/enzyme-adapter-react-16.3/package.json b/packages/enzyme-adapter-react-16.3/package.json
@@ -39,6 +39,7 @@
   "license": "MIT",
   "dependencies": {
     "enzyme-adapter-utils": "^1.14.0",
+    "enzyme-shallow-equal": "^1.0.4",
     "object.assign": "^4.1.0",
     "object.values": "^1.1.1",
     "prop-types": "^15.7.2",

diff --git a/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js b/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js
@@ -26,6 +26,7 @@ import {
 } from 'react-is';
 import { EnzymeAdapter } from 'enzyme';
 import { typeOfNode } from 'enzyme/build/Utils';
+import shallowEqual from 'enzyme-shallow-equal';
 import {
   displayNameOfNode,
   elementToTree as utilElementToTree,
@@ -45,6 +46,7 @@ import {
   getNodeFromRootFinder,
   wrapWithWrappingComponent,
   getWrappingComponentMountRenderer,
+  spyMethod,
 } from 'enzyme-adapter-utils';
 import { findCurrentFiberUsingSlowPath } from 'react-reconciler/reflection';
 
@@ -411,6 +413,32 @@ class ReactSixteenThreeAdapter extends EnzymeAdapter {
             );
             return withSetStateAllowed(() => renderer.render({ ...el, type: wrappedEl }, context));
           }
+
+          if (isStateful) {
+            if (
+              renderer._instance
+              && el.props === renderer._instance.props
+              && !shallowEqual(context, renderer._instance.context)
+            ) {
+              const { restore } = spyMethod(
+                renderer,
+                '_updateClassComponent',
+                (originalMethod) => function _updateClassComponent(...args) {
+                  const { props } = renderer._instance;
+                  const clonedProps = { ...props };
+                  renderer._instance.props = clonedProps;
+
+                  const result = originalMethod.apply(renderer, args);
+
+                  renderer._instance.props = props;
+                  restore();
+
+                  return result;
+                },
+              );
+            }
+          }
+
           return withSetStateAllowed(() => renderer.render(el, context));
         }
       },

diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -57,6 +57,7 @@ import {
   wrapWithWrappingComponent,
   getWrappingComponentMountRenderer,
   compareNodeTypeOf,
+  spyMethod,
 } from 'enzyme-adapter-utils';
 import findCurrentFiberUsingSlowPath from './findCurrentFiberUsingSlowPath';
 import detectFiberTags from './detectFiberTags';
@@ -700,14 +701,39 @@ class ReactSixteenAdapter extends EnzymeAdapter {
             ));
           }
 
-          if (!isStateful(Component) && typeof Component === 'function') {
+          const isComponentStateful = isStateful(Component);
+
+          if (!isComponentStateful && typeof Component === 'function') {
             return withSetStateAllowed(() => renderElement(
               { ...renderedEl, type: wrapFunctionalComponent(Component) },
               context,
             ));
           }
 
-          if (isStateful) {
+          if (isComponentStateful) {
+            if (
+              renderer._instance
+              && el.props === renderer._instance.props
+              && !shallowEqual(context, renderer._instance.context)
+            ) {
+              const { restore } = spyMethod(
+                renderer,
+                '_updateClassComponent',
+                (originalMethod) => function _updateClassComponent(...args) {
+                  const { props } = renderer._instance;
+                  const clonedProps = { ...props };
+                  renderer._instance.props = clonedProps;
+
+                  const result = originalMethod.apply(renderer, args);
+
+                  renderer._instance.props = props;
+                  restore();
+
+                  return result;
+                },
+              );
+            }
+
             // fix react bug; see implementation of `getEmptyStateValue`
             const emptyStateValue = getEmptyStateValue();
             if (emptyStateValue) {

diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -122,7 +122,6 @@ describeWithDOM('mount', () => {
         expect(document.createElement('div')).to.be.instanceOf(HTMLElement);
 
         const [[firstArg]] = spy.args;
-        console.log(firstArg);
         expect(firstArg).to.be.instanceOf(HTMLElement);
       });
 

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -2087,6 +2087,10 @@ describe('shallow', () => {
           }
         }
 
+        Foo.contextTypes = {
+          foo: PropTypes.string,
+        };
+
         const options = {
           disableLifecycleMethods: true,
           context: {
@@ -2122,51 +2126,19 @@ describe('shallow', () => {
           ]);
         });
 
-        describeIf(is('0.13 || 15 || > 16'), 'setContext', () => {
+        describe('setContext', () => {
           it('calls expected methods when receiving new context', () => {
             const wrapper = shallow(<Foo />, options);
             expect(spy.args).to.deep.equal([
               ['componentWillMount'],
               ['render'],
             ]);
             spy.resetHistory();
-            wrapper.setContext({ foo: 'foo' });
-            expect(spy.args).to.deep.equal([
-              ['componentWillReceiveProps'],
-              ['shouldComponentUpdate'],
-              ['componentWillUpdate'],
-              ['render'],
-            ]);
-          });
-        });
 
-        describeIf(is('16'), 'setContext', () => {
-          it('calls expected methods when receiving new context', () => {
-            const wrapper = shallow(<Foo />, options);
-            expect(spy.args).to.deep.equal([
-              ['componentWillMount'],
-              ['render'],
-            ]);
-            spy.resetHistory();
-            wrapper.setContext({ foo: 'foo' });
-            expect(spy.args).to.deep.equal([
-              ['shouldComponentUpdate'],
-              ['componentWillUpdate'],
-              ['render'],
-            ]);
-          });
-        });
+            wrapper.setContext({ foo: 'bar' });
 
-        describeIf(is('0.14'), 'setContext', () => {
-          it('calls expected methods when receiving new context', () => {
-            const wrapper = shallow(<Foo />, options);
-            expect(spy.args).to.deep.equal([
-              ['componentWillMount'],
-              ['render'],
-            ]);
-            spy.resetHistory();
-            wrapper.setContext({ foo: 'foo' });
             expect(spy.args).to.deep.equal([
+              ['componentWillReceiveProps'],
               ['shouldComponentUpdate'],
               ['componentWillUpdate'],
               ['render'],