Merge pull request #230 from CurtisHumphrey/mount_find_component_by_name

[mount] Fix find by component name
enzymejs · Mar 7, 2016 · 907fe34 · 907fe34
2 parents f04a131 + 2d69c0d
commit 907fe34
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/MountedTraversal.js b/src/MountedTraversal.js
@@ -11,6 +11,7 @@ import {
   isCompoundSelector,
   AND,
   SELECTOR,
+  nodeHasType,
 } from './Utils';
 import {
   isDOMComponent,
@@ -62,8 +63,7 @@ export function instHasId(inst, id) {
 export function instHasType(inst, type) {
   switch (typeof type) {
     case 'string':
-      return isDOMComponent(inst) &&
-        inst.tagName.toUpperCase() === type.toUpperCase();
+      return nodeHasType(getNode(inst), type);
     case 'function':
       return isCompositeComponentWithType(inst, type);
     default:

diff --git a/src/ShallowTraversal.js b/src/ShallowTraversal.js
@@ -11,6 +11,7 @@ import {
   selectorType,
   AND,
   SELECTOR,
+  nodeHasType,
 } from './Utils';
 
 
@@ -91,14 +92,6 @@ export function nodeHasProperty(node, propKey, stringifiedPropValue) {
   return nodeProps.hasOwnProperty(propKey);
 }
 
-
-export function nodeHasType(node, type) {
-  if (!type || !node) return false;
-  if (!node.type) return false;
-  if (typeof node.type === 'string') return node.type === type;
-  return node.type.name === type || node.type.displayName === type;
-}
-
 export function nodeMatchesObjectProps(node, props) {
   return isSubset(propsOfNode(node), props);
 }

diff --git a/src/Utils.js b/src/Utils.js
@@ -28,6 +28,13 @@ export function getNode(node) {
   return isDOMComponent(node) ? findDOMNode(node) : node;
 }
 
+export function nodeHasType(node, type) {
+  if (!type || !node) return false;
+  if (!node.type) return false;
+  if (typeof node.type === 'string') return node.type === type;
+  return node.type.name === type || node.type.displayName === type;
+}
+
 export function childrenEqual(a, b) {
   if (a === b) return true;
   if (!Array.isArray(a) && !Array.isArray(b)) {

diff --git a/test/ReactWrapper-spec.js b/test/ReactWrapper-spec.js
@@ -181,6 +181,18 @@ describeWithDOM('mount', () => {
       expect(wrapper.find(Foo).type()).to.equal(Foo);
     });
 
+    it('should find a component based on a component displayName', () => {
+      class Foo extends React.Component {
+        render() { return <div />; }
+      }
+      const wrapper = mount(
+        <div>
+          <Foo className="foo" />
+        </div>
+      );
+      expect(wrapper.find('Foo').type()).to.equal(Foo);
+    });
+
     it('should find component based on a react prop', () => {
       const wrapper = mount(
         <div>