expect: Make change requested in toThrowMatchers (#7718)

jestjs · Jan 29, 2019 · 7d54557 · 7d54557
1 parent 0633a61
commit 7d54557
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/packages/expect/src/toThrowMatchers.js b/packages/expect/src/toThrowMatchers.js
@@ -38,28 +38,22 @@ type Thrown =
     };
 
 const getThrown = (e: any): Thrown => {
-  if (
-    e !== null &&
-    e !== undefined &&
-    typeof e.message === 'string' &&
-    typeof e.name === 'string' &&
-    typeof e.stack === 'string'
-  ) {
+  const hasMessage =
+    e !== null && e !== undefined && typeof e.message === 'string';
+
+  if (hasMessage && typeof e.name === 'string' && typeof e.stack === 'string') {
     return {
-      hasMessage: true,
+      hasMessage,
       isError: true,
       message: e.message,
       value: e,
     };
   }
 
-  const hasMessage =
-    e !== null && e !== undefined && typeof e.message === 'string';
-
   return {
     hasMessage,
     isError: false,
-    message: hasMessage ? e.message : typeof e === 'string' ? e : String(e),
+    message: hasMessage ? e.message : String(e),
     value: e,
   };
 };