Added a test

Author: Brian Vaughn

src/ErrorBoundary.js

@@ -63,11 +63,6 @@ class ErrorBoundary extends Component<Props, State> {
   }
 }
 
-
-function getDisplayName(WrappedComponent) {
-  return WrappedComponent.displayName || WrappedComponent.name || 'Component';
-}
-
 export const withErrorBoundary = (
   Component: ComponentType<any>,
   FallbackComponent: ComponentType<any>,
@@ -78,7 +73,13 @@ export const withErrorBoundary = (
       <Component {...props} />
     </ErrorBoundary>
   );
-  Wrapped.displayName = `WithErrorBoundary(${getDisplayName(Component)})`;
+
+  // Format for display in DevTools
+  const name = Component.displayName || Component.name;
+  Wrapped.displayName = name
+    ? `WithErrorBoundary(${name})`
+    : 'WithErrorBoundary';
+
   return Wrapped;
 };
 

src/__tests__/ErrorBoundary.test.js

@@ -260,4 +260,23 @@ describe('ErrorBoundary', () => {
       ),
     ).toBe(true);
   });
+
+  it('sets the correct displayName for wrapped components', () => {
+    function NormalComponent() {
+      return null;
+    }
+    expect(withErrorBoundary(NormalComponent).displayName).toBe(
+      'WithErrorBoundary(NormalComponent)',
+    );
+
+    function ComponentWithDisplayNameOverride() {
+      return null;
+    }
+    ComponentWithDisplayNameOverride.displayName = 'Override';
+
+    expect(
+      withErrorBoundary(ComponentWithDisplayNameOverride).displayName,
+    ).toBe('WithErrorBoundary(Override)');
+    expect(withErrorBoundary(() => null).displayName).toBe('WithErrorBoundary');
+  });
 });