[enzyme-adapter-utils] [refactor] clean up makeValidElementType pro…

…pType
enzymejs · Feb 28, 2020 · 4c591f7 · 4c591f7
1 parent 1eb020e
commit 4c591f7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/packages/enzyme-adapter-utils/src/createMountWrapper.jsx b/packages/enzyme-adapter-utils/src/createMountWrapper.jsx
@@ -11,17 +11,7 @@ const makeValidElementType = (adapter) => {
     return stringOrFunction;
   }
 
-  function validElementType(props, propName, ...args) {
-    if (!adapter.isValidElementType) {
-      return stringOrFunction(props, propName, ...args);
-    }
-    const propValue = props[propName];
-    if (propValue == null || adapter.isValidElementType(propValue)) {
-      return null;
-    }
-    return new TypeError(`${propName} must be a valid element type!`);
-  }
-  validElementType.isRequired = function validElementTypeRequired(props, propName, ...args) {
+  function validElementTypeRequired(props, propName, ...args) {
     if (!adapter.isValidElementType) {
       return stringOrFunction.isRequired(props, propName, ...args);
     }
@@ -30,7 +20,17 @@ const makeValidElementType = (adapter) => {
       return null;
     }
     return new TypeError(`${propName} must be a valid element type!`);
-  };
+  }
+
+  function validElementType(props, propName, ...args) {
+    const propValue = props[propName];
+    if (propValue == null) {
+      return null;
+    }
+    return validElementTypeRequired(props, propName, ...args);
+  }
+  validElementType.isRequired = validElementTypeRequired;
+
   return validElementType;
 };
 

diff --git a/packages/enzyme-test-suite/test/shared/methods/find.jsx b/packages/enzyme-test-suite/test/shared/methods/find.jsx
@@ -174,6 +174,21 @@ export default function describeFind({
         );
       });
 
+    wrap()
+      .withOverride(() => getAdapter(), 'isValidElementType', () => {})
+      .it('works when an adapter’s `isValidElementType` does not exist', () => {
+        class Foo extends React.Component {
+          render() { return <div />; }
+        }
+        const wrapper = Wrap((
+          <div>
+            <Foo className="foo" />
+          </div>
+        ));
+
+        expect(wrapper.find(Foo)).to.have.lengthOf(1);
+      });
+
     it('finds a component based on a component function name', () => {
       class Foo extends React.Component {
         render() { return <div />; }