fix and improve

jestjs · Oct 11, 2022 · 31d795c · 31d795c
1 parent a39810a
commit 31d795c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/packages/jest-circus/src/index.ts b/packages/jest-circus/src/index.ts
@@ -186,9 +186,9 @@ const test: Global.It = (() => {
     ) => void,
     timeout?: number,
     failing?: boolean,
-    error?: Error,
+    asyncError?: Error,
   ) => {
-    const asyncError = error || new ErrorWithStack(undefined, testFn);
+    asyncError = asyncError || new ErrorWithStack(undefined, testFn);
 
     try {
       testName = convertDescriptorToString(testName);

diff --git a/packages/jest-console/src/BufferedConsole.ts b/packages/jest-console/src/BufferedConsole.ts
@@ -79,6 +79,7 @@ export default class BufferedConsole extends Console {
       if (!(error instanceof AssertionError)) {
         throw error;
       }
+      // https://github.com/facebook/jest/pull/13422#issuecomment-1273396392
       this._log('assert', error.toString().replace(/:\n\n.*\n/gs, ''));
     }
   }

diff --git a/packages/jest-console/src/CustomConsole.ts b/packages/jest-console/src/CustomConsole.ts
@@ -56,6 +56,7 @@ export default class CustomConsole extends Console {
       if (!(error instanceof AssertionError)) {
         throw error;
       }
+      // https://github.com/facebook/jest/pull/13422#issuecomment-1273396392
       this._logError('assert', error.toString().replace(/:\n\n.*\n/gs, ''));
     }
   }

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
@@ -66,9 +66,14 @@ export default function bind<EachCallback extends Global.TestCallback>(
               ),
         );
       } catch (e: any) {
-        const err = new Error(e.message);
-        err.stack = error.stack?.replace(/^Error: /s, e.message);
-        err.name = '';
+        let err = new Error(e.message);
+
+        // CIRCUS
+        if (typeof 'it' === 'function') {
+          err.stack = error.stack?.replace(/^Error: /s, e.message);
+        } else {
+          err.stack = error.stack;
+        }
 
         return cb(title, () => {
           throw err;