[enzyme-react-adapter-{16,16.1,16.2,16.3}] [fix] nodeToHostNode req…

…uire `supportsArray` argument to return an array. [enzyme] [patch] `mount`: provide `supportsArray` to `adapter.nodeToHostNode` Fixes enzymejs#2002.
yadleo · Feb 5, 2019 · 8221765 · 8221765
1 parent 8d245ba
commit 8221765
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -482,8 +482,12 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
     return elementToTree(element);
   }
 
-  nodeToHostNode(node) {
-    return nodeToHostNode(node);
+  nodeToHostNode(node, supportsArray = false) {
+    const nodes = nodeToHostNode(node);
+    if (Array.isArray(nodes) && !supportsArray) {
+      return nodes[0];
+    }
+    return nodes;
   }
 
   displayNameOfNode(node) {

diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -484,8 +484,12 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
     return elementToTree(element);
   }
 
-  nodeToHostNode(node) {
-    return nodeToHostNode(node);
+  nodeToHostNode(node, supportsArray = false) {
+    const nodes = nodeToHostNode(node);
+    if (Array.isArray(nodes) && !supportsArray) {
+      return nodes[0];
+    }
+    return nodes;
   }
 
   displayNameOfNode(node) {

diff --git a/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js b/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js
@@ -462,8 +462,12 @@ class ReactSixteenThreeAdapter extends EnzymeAdapter {
     return elementToTree(element);
   }
 
-  nodeToHostNode(node) {
-    return nodeToHostNode(node);
+  nodeToHostNode(node, supportsArray = false) {
+    const nodes = nodeToHostNode(node);
+    if (Array.isArray(nodes) && !supportsArray) {
+      return nodes[0];
+    }
+    return nodes;
   }
 
   displayNameOfNode(node) {

diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -510,8 +510,12 @@ class ReactSixteenAdapter extends EnzymeAdapter {
     return elementToTree(element);
   }
 
-  nodeToHostNode(node) {
-    return nodeToHostNode(node);
+  nodeToHostNode(node, supportsArray = false) {
+    const nodes = nodeToHostNode(node);
+    if (Array.isArray(nodes) && !supportsArray) {
+      return nodes[0];
+    }
+    return nodes;
   }
 
   displayNameOfNode(node) {

diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -5168,7 +5168,7 @@ describeWithDOM('mount', () => {
       });
     });
 
-    describeIf(is('>16.2'), 'fragments', () => {
+    describeIf(is('>16.2'), 'Fragments', () => {
       class FragmentClassExample extends React.Component {
         render() {
           return (

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -5240,7 +5240,7 @@ describe('shallow', () => {
       });
     });
 
-    describeIf(is('>16.2'), 'fragments', () => {
+    describeIf(is('>16.2'), 'Fragments', () => {
       class FragmentClassExample extends React.Component {
         render() {
           return (

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -187,7 +187,7 @@ class ReactWrapper {
    */
   getDOMNode() {
     const adapter = getAdapter(this[OPTIONS]);
-    return this.single('getDOMNode', n => adapter.nodeToHostNode(n));
+    return this.single('getDOMNode', n => adapter.nodeToHostNode(n, true));
   }
 
   /**
@@ -575,7 +575,7 @@ class ReactWrapper {
   text() {
     const adapter = getAdapter(this[OPTIONS]);
     return this.single('text', (n) => {
-      const node = adapter.nodeToHostNode(n);
+      const node = adapter.nodeToHostNode(n, true);
       if (!node) {
         return typeof n === 'string' ? n : node;
       }