[enzyme-adapter-react-*] [new] add isCustomComponent

enzymejs · Jan 2, 2019 · 2e11497 · 2e11497
1 parent 7b9e478
commit 2e11497
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 2 deletions.
diff --git a/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js b/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js
@@ -277,6 +277,10 @@ class ReactThirteenAdapter extends EnzymeAdapter {
     return typeof object === 'string' || typeof object === 'function';
   }
 
+  isCustomComponent(component) {
+    return typeof component === 'function';
+  }
+
   createElement(...args) {
     return React.createElement(...args);
   }

diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -252,6 +252,10 @@ class ReactFourteenAdapter extends EnzymeAdapter {
     return isValidElementType(object);
   }
 
+  isCustomComponent(component) {
+    return typeof component === 'function';
+  }
+
   createElement(...args) {
     return React.createElement(...args);
   }

diff --git a/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js b/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
@@ -287,6 +287,10 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
     return isValidElementType(object);
   }
 
+  isCustomComponent(component) {
+    return typeof component === 'function';
+  }
+
   createElement(...args) {
     return React.createElement(...args);
   }

diff --git a/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js b/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
@@ -287,6 +287,10 @@ class ReactFifteenAdapter extends EnzymeAdapter {
     return isValidElementType(object);
   }
 
+  isCustomComponent(component) {
+    return typeof component === 'function';
+  }
+
   createElement(...args) {
     return React.createElement(...args);
   }

diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -505,6 +505,10 @@ class ReactSixteenOneAdapter extends EnzymeAdapter {
     return isValidElementType(object);
   }
 
+  isCustomComponent(component) {
+    return typeof component === 'function';
+  }
+
   createElement(...args) {
     return React.createElement(...args);
   }

diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -507,6 +507,10 @@ class ReactSixteenTwoAdapter extends EnzymeAdapter {
     return isValidElementType(object);
   }
 
+  isCustomComponent(component) {
+    return typeof component === 'function';
+  }
+
   isFragment(fragment) {
     return typeOfNode(fragment) === Fragment;
   }

diff --git a/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js b/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js
@@ -514,11 +514,15 @@ class ReactSixteenThreeAdapter extends EnzymeAdapter {
     return typeOfNode(fragment) === Fragment;
   }
 
+  isCustomComponent(type) {
+    return typeof type === 'function' || isForwardRef({ type });
+  }
+
   isCustomComponentElement(inst) {
     if (!inst || !this.isValidElement(inst)) {
       return false;
     }
-    return typeof inst.type === 'function' || isForwardRef(inst);
+    return this.isCustomComponent(inst.type);
   }
 
   createElement(...args) {

diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -595,11 +595,15 @@ class ReactSixteenAdapter extends EnzymeAdapter {
     return typeOfNode(fragment) === Fragment;
   }
 
+  isCustomComponent(type) {
+    return typeof type === 'function' || isForwardRef({ type });
+  }
+
   isCustomComponentElement(inst) {
     if (!inst || !this.isValidElement(inst)) {
       return false;
     }
-    return typeof inst.type === 'function' || isForwardRef(inst);
+    return this.isCustomComponent(inst.type);
   }
 
   createElement(...args) {

diff --git a/packages/enzyme-test-suite/test/Adapter-spec.jsx b/packages/enzyme-test-suite/test/Adapter-spec.jsx
@@ -1092,4 +1092,29 @@ Warning: Failed Adapter-spec type: Invalid Adapter-spec \`foo\` of type \`string
         `.trim());
       });
   });
+
+  describe('isCustomComponent', () => {
+    function FunctionComponent() {
+      return null;
+    }
+    class ClassComponent extends React.Component {
+      render() {
+        return null;
+      }
+    }
+
+    it('returns true for functional/class components', () => {
+      expect(adapter.isCustomComponent(FunctionComponent)).to.equal(true);
+      expect(adapter.isCustomComponent(ClassComponent)).to.equal(true);
+    });
+
+    it('returns false for everything else', () => {
+      expect(adapter.isCustomComponent({})).to.equal(false);
+      expect(adapter.isCustomComponent(true)).to.equal(false);
+    });
+
+    itIf(is('>=16.3'), 'returns true for forward refs', () => {
+      expect(adapter.isCustomComponent(React.forwardRef(() => null))).to.equal(true);
+    });
+  });
 });