prioritize displayName over name (enzymejs#332)

React provides the ability to override a component's display name by using the `displayName` property. When `displayName` is provided it should take precedence over `name`. Prior to this pull request, `displayName` would only ever be used if `name` is not present but it should have been the other way around.
jgzuke · Apr 22, 2016 · 91f0f98 · 91f0f98
1 parent d31aeeb
commit 91f0f98
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/ShallowTraversal.js b/src/ShallowTraversal.js
@@ -165,7 +165,7 @@ export function getTextFromNode(node) {
   }
 
   if (node.type && typeof node.type === 'function') {
-    return `<${node.type.name || node.type.displayName} />`;
+    return `<${node.type.displayName || node.type.name} />`;
   }
 
   return childrenOfNode(node).map(getTextFromNode).join('').replace(/\s+/, ' ');

diff --git a/test/ShallowTraversal-spec.js b/test/ShallowTraversal-spec.js
@@ -10,6 +10,7 @@ import {
   treeForEach,
   treeFilter,
   pathToNode,
+  getTextFromNode,
 } from '../src/ShallowTraversal';
 
 describe('ShallowTraversal', () => {
@@ -253,4 +254,34 @@ describe('ShallowTraversal', () => {
 
   });
 
+  describe('getTextFromNode', () => {
+    it('should return displayName for functions that provides one', () => {
+      class Subject extends React.Component {
+        render() {
+          return (
+            <div />
+          );
+        }
+      }
+      Subject.displayName = 'CustomSubject';
+      const node = <Subject />;
+      const result = getTextFromNode(node);
+      expect(result).to.equal('<CustomSubject />');
+    });
+
+    it('should return function name if displayName is not provided', () => {
+      class Subject extends React.Component {
+        render() {
+          return (
+            <div />
+          );
+        }
+      }
+      const node = <Subject />;
+      const result = getTextFromNode(node);
+      expect(result).to.equal('<Subject />');
+    });
+
+  });
+
 });