update to instance-level options

enzymejs · Sep 26, 2017 · a08df67 · a08df67
1 parent 88d9c76
commit a08df67
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js b/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js
@@ -96,6 +96,13 @@ function instanceToTree(inst) {
 }
 
 class ReactThirteenAdapter extends EnzymeAdapter {
+  constructor() {
+    super();
+    this.options = {
+      ...this.options,
+      supportPrevContextArgumentOfComponentDidUpdate: true,
+    };
+  }
   createMountRenderer(options) {
     assertDomAvailable('mount');
     const domNode = options.attachTo || global.document.createElement('div');
@@ -144,7 +151,6 @@ class ReactThirteenAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
-      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -68,6 +68,13 @@ function instanceToTree(inst) {
 }
 
 class ReactFifteenAdapter extends EnzymeAdapter {
+  constructor() {
+    super();
+    this.options = {
+      ...this.options,
+      supportPrevContextArgumentOfComponentDidUpdate: true,
+    };
+  }
   createMountRenderer(options) {
     assertDomAvailable('mount');
     const domNode = options.attachTo || global.document.createElement('div');
@@ -116,7 +123,6 @@ class ReactFifteenAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
-      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js b/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
@@ -98,6 +98,13 @@ function instanceToTree(inst) {
 }
 
 class ReactFifteenFourAdapter extends EnzymeAdapter {
+  constructor() {
+    super();
+    this.options = {
+      ...this.options,
+      supportPrevContextArgumentOfComponentDidUpdate: true,
+    };
+  }
   createMountRenderer(options) {
     assertDomAvailable('mount');
     const domNode = options.attachTo || global.document.createElement('div');
@@ -146,7 +153,6 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
-      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js b/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
@@ -98,6 +98,13 @@ function instanceToTree(inst) {
 }
 
 class ReactFifteenAdapter extends EnzymeAdapter {
+  constructor() {
+    super();
+    this.options = {
+      ...this.options,
+      supportPrevContextArgumentOfComponentDidUpdate: true,
+    };
+  }
   createMountRenderer(options) {
     assertDomAvailable('mount');
     const domNode = options.attachTo || global.document.createElement('div');
@@ -146,7 +153,6 @@ class ReactFifteenAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
-      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-test-suite/package.json b/packages/enzyme-test-suite/package.json
@@ -40,5 +40,4 @@
     "react": "^15.5.0",
     "react-dom": "^15.5.0"
   }
-}
-
+}
diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -311,7 +311,7 @@ class ShallowWrapper {
               instance &&
               typeof instance.componentDidUpdate === 'function'
             ) {
-              if (this[RENDERER].supportPrevContextArgumentOfComponentDidUpdate) {
+              if (adapter.options.supportPrevContextArgumentOfComponentDidUpdate) {
                 instance.componentDidUpdate(prevProps, state, prevContext);
               } else {
                 instance.componentDidUpdate(prevProps, state);
@@ -405,7 +405,11 @@ class ShallowWrapper {
           instance &&
           typeof instance.componentDidUpdate === 'function'
         ) {
-          instance.componentDidUpdate(prevProps, prevState, prevContext);
+          if (adapter.options.supportPrevContextArgumentOfComponentDidUpdate) {
+            instance.componentDidUpdate(prevProps, prevState, prevContext);
+          } else {
+            instance.componentDidUpdate(prevProps, prevState);
+          }
         }
         this.update();
       });