[enzyme-adapter-react-{14,15.4,15,16.1,16.2,16.3,16] [new] add `wrapW…

…ithWrappingComponent`
enzymejs · Jan 2, 2019 · fc61100 · fc61100
1 parent 2e11497
commit fc61100
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 13 deletions.
diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -19,6 +19,10 @@ import {
   propsWithKeysAndRef,
   ensureKeyOrUndefined,
   wrap,
+  RootFinder,
+  getNodeFromRootFinder,
+  wrapWithWrappingComponent,
+  getWrappingComponentMountRenderer,
 } from 'enzyme-adapter-utils';
 
 function typeToNodeType(type) {
@@ -103,6 +107,7 @@ class ReactFourteenAdapter extends EnzymeAdapter {
           const { type, props, ref } = el;
           const wrapperProps = {
             Component: type,
+            wrappingComponentProps: options.wrappingComponentProps,
             props,
             context,
             ...(ref && { ref }),
@@ -122,7 +127,14 @@ class ReactFourteenAdapter extends EnzymeAdapter {
         instance = null;
       },
       getNode() {
-        return instance ? instanceToTree(instance._reactInternalInstance).rendered : null;
+        if (!instance) {
+          return null;
+        }
+        return getNodeFromRootFinder(
+          adapter.isCustomComponent,
+          instanceToTree(instance._reactInternalInstance),
+          options,
+        );
       },
       simulateEvent(node, event, mock) {
         const mappedEvent = mapNativeEventNames(event);
@@ -136,6 +148,15 @@ class ReactFourteenAdapter extends EnzymeAdapter {
       batchedUpdates(fn) {
         return ReactDOM.unstable_batchedUpdates(fn);
       },
+      getWrappingComponentRenderer() {
+        return {
+          ...this,
+          ...getWrappingComponentMountRenderer({
+            toTree: inst => instanceToTree(inst._reactInternalInstance),
+            getMountWrapperInstance: () => instance,
+          }),
+        };
+      },
     };
   }
 
@@ -259,6 +280,13 @@ class ReactFourteenAdapter extends EnzymeAdapter {
   createElement(...args) {
     return React.createElement(...args);
   }
+
+  wrapWithWrappingComponent(node, options) {
+    return {
+      RootFinder,
+      node: wrapWithWrappingComponent(React.createElement, node, options),
+    };
+  }
 }
 
 module.exports = ReactFourteenAdapter;
diff --git a/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js b/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
@@ -19,6 +19,10 @@ import {
   propsWithKeysAndRef,
   ensureKeyOrUndefined,
   wrap,
+  RootFinder,
+  getNodeFromRootFinder,
+  wrapWithWrappingComponent,
+  getWrappingComponentMountRenderer,
 } from 'enzyme-adapter-utils';
 import ifReact from 'enzyme-adapter-react-helper/build/ifReact';
 
@@ -138,6 +142,7 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
           const { type, props, ref } = el;
           const wrapperProps = {
             Component: type,
+            wrappingComponentProps: options.wrappingComponentProps,
             props,
             context,
             ...(ref && { ref }),
@@ -157,7 +162,14 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
         instance = null;
       },
       getNode() {
-        return instance ? instanceToTree(instance._reactInternalInstance).rendered : null;
+        if (!instance) {
+          return null;
+        }
+        return getNodeFromRootFinder(
+          adapter.isCustomComponent,
+          instanceToTree(instance._reactInternalInstance),
+          options,
+        );
       },
       simulateEvent(node, event, mock) {
         const mappedEvent = mapNativeEventNames(event, eventOptions);
@@ -171,6 +183,15 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
       batchedUpdates(fn) {
         return ReactDOM.unstable_batchedUpdates(fn);
       },
+      getWrappingComponentRenderer() {
+        return {
+          ...this,
+          ...getWrappingComponentMountRenderer({
+            toTree: inst => instanceToTree(inst._reactInternalInstance),
+            getMountWrapperInstance: () => instance,
+          }),
+        };
+      },
     };
   }
 
@@ -304,6 +325,13 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
     );
     invoke();
   }
+
+  wrapWithWrappingComponent(node, options) {
+    return {
+      RootFinder,
+      node: wrapWithWrappingComponent(React.createElement, node, options),
+    };
+  }
 }
 
 module.exports = ReactFifteenFourAdapter;
diff --git a/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js b/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
@@ -21,6 +21,10 @@ import {
   propsWithKeysAndRef,
   ensureKeyOrUndefined,
   wrap,
+  RootFinder,
+  getNodeFromRootFinder,
+  wrapWithWrappingComponent,
+  getWrappingComponentMountRenderer,
 } from 'enzyme-adapter-utils';
 
 function compositeTypeToNodeType(type) {
@@ -138,6 +142,7 @@ class ReactFifteenAdapter extends EnzymeAdapter {
           const { type, props, ref } = el;
           const wrapperProps = {
             Component: type,
+            wrappingComponentProps: options.wrappingComponentProps,
             props,
             context,
             ...(ref && { ref }),
@@ -157,7 +162,14 @@ class ReactFifteenAdapter extends EnzymeAdapter {
         instance = null;
       },
       getNode() {
-        return instance ? instanceToTree(instance._reactInternalInstance).rendered : null;
+        if (!instance) {
+          return null;
+        }
+        return getNodeFromRootFinder(
+          adapter.isCustomComponent,
+          instanceToTree(instance._reactInternalInstance),
+          options,
+        );
       },
       simulateEvent(node, event, mock) {
         const mappedEvent = mapNativeEventNames(event, eventOptions);
@@ -171,6 +183,15 @@ class ReactFifteenAdapter extends EnzymeAdapter {
       batchedUpdates(fn) {
         return ReactDOM.unstable_batchedUpdates(fn);
       },
+      getWrappingComponentRenderer() {
+        return {
+          ...this,
+          ...getWrappingComponentMountRenderer({
+            toTree: inst => instanceToTree(inst._reactInternalInstance),
+            getMountWrapperInstance: () => instance,
+          }),
+        };
+      },
     };
   }
 
@@ -299,6 +320,13 @@ class ReactFifteenAdapter extends EnzymeAdapter {
     // React in >= 15.4, and < 16 pass undefined to a setState callback
     callback.call(instance, undefined);
   }
+
+  wrapWithWrappingComponent(node, options) {
+    return {
+      RootFinder,
+      node: wrapWithWrappingComponent(React.createElement, node, options),
+    };
+  }
 }
 
 module.exports = ReactFifteenAdapter;
diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -32,6 +32,10 @@ import {
   wrap,
   getMaskedContext,
   getComponentStack,
+  RootFinder,
+  getNodeFromRootFinder,
+  wrapWithWrappingComponent,
+  getWrappingComponentMountRenderer,
 } from 'enzyme-adapter-utils';
 import { findCurrentFiberUsingSlowPath } from 'react-reconciler/reflection';
 
@@ -261,7 +265,7 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
 
   createMountRenderer(options) {
     assertDomAvailable('mount');
-    const { attachTo, hydrateIn } = options;
+    const { attachTo, hydrateIn, wrappingComponentProps } = options;
     const domNode = hydrateIn || attachTo || global.document.createElement('div');
     let instance = null;
     const adapter = this;
@@ -272,6 +276,7 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
           const wrapperProps = {
             Component: type,
             props,
+            wrappingComponentProps,
             context,
             ...(ref && { ref }),
           };
@@ -292,7 +297,14 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
         instance = null;
       },
       getNode() {
-        return instance ? toTree(instance._reactInternalFiber).rendered : null;
+        if (!instance) {
+          return null;
+        }
+        return getNodeFromRootFinder(
+          adapter.isCustomComponent,
+          toTree(instance._reactInternalFiber),
+          options,
+        );
       },
       simulateError(nodeHierarchy, rootNode, error) {
         const { instance: catchingInstance } = nodeHierarchy
@@ -320,6 +332,15 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
         return fn();
         // return ReactDOM.unstable_batchedUpdates(fn);
       },
+      getWrappingComponentRenderer() {
+        return {
+          ...this,
+          ...getWrappingComponentMountRenderer({
+            toTree: inst => toTree(inst._reactInternalFiber),
+            getMountWrapperInstance: () => instance,
+          }),
+        };
+      },
     };
   }
 
@@ -512,6 +533,13 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
   createElement(...args) {
     return React.createElement(...args);
   }
+
+  wrapWithWrappingComponent(node, options) {
+    return {
+      RootFinder,
+      node: wrapWithWrappingComponent(React.createElement, node, options),
+    };
+  }
 }
 
 module.exports = ReactSixteenOneAdapter;
diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -33,6 +33,10 @@ import {
   wrap,
   getMaskedContext,
   getComponentStack,
+  RootFinder,
+  getNodeFromRootFinder,
+  wrapWithWrappingComponent,
+  getWrappingComponentMountRenderer,
 } from 'enzyme-adapter-utils';
 import { findCurrentFiberUsingSlowPath } from 'react-reconciler/reflection';
 
@@ -263,7 +267,7 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
 
   createMountRenderer(options) {
     assertDomAvailable('mount');
-    const { attachTo, hydrateIn } = options;
+    const { attachTo, hydrateIn, wrappingComponentProps } = options;
     const domNode = hydrateIn || attachTo || global.document.createElement('div');
     let instance = null;
     const adapter = this;
@@ -274,6 +278,7 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
           const wrapperProps = {
             Component: type,
             props,
+            wrappingComponentProps,
             context,
             ...(ref && { ref }),
           };
@@ -294,7 +299,14 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
         instance = null;
       },
       getNode() {
-        return instance ? toTree(instance._reactInternalFiber).rendered : null;
+        if (!instance) {
+          return null;
+        }
+        return getNodeFromRootFinder(
+          adapter.isCustomComponent,
+          toTree(instance._reactInternalFiber),
+          options,
+        );
       },
       simulateError(nodeHierarchy, rootNode, error) {
         const { instance: catchingInstance } = nodeHierarchy
@@ -322,6 +334,15 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
         return fn();
         // return ReactDOM.unstable_batchedUpdates(fn);
       },
+      getWrappingComponentRenderer() {
+        return {
+          ...this,
+          ...getWrappingComponentMountRenderer({
+            toTree: inst => toTree(inst._reactInternalFiber),
+            getMountWrapperInstance: () => instance,
+          }),
+        };
+      },
     };
   }
 
@@ -518,6 +539,13 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
   createElement(...args) {
     return React.createElement(...args);
   }
+
+  wrapWithWrappingComponent(node, options) {
+    return {
+      RootFinder,
+      node: wrapWithWrappingComponent(React.createElement, node, options),
+    };
+  }
 }
 
 module.exports = ReactSixteenTwoAdapter;