feat: use formatTime

jestjs · Dec 9, 2020 · dbb7175 · dbb7175
1 parent 2fe7e9c
commit dbb7175
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/e2e/__tests__/babelPluginJestDeadlines.test.ts b/e2e/__tests__/babelPluginJestDeadlines.test.ts
@@ -39,7 +39,7 @@ it('throws on deadline exceeded', () => {
 function summaryWithoutTime(result: {stderr: string}) {
   const summary = extractSummary(result.stderr);
   summary.rest = summary.rest.replace(
-    /(waited here for) \d+ms/,
+    /(waited here for) \d*\.?\d+ m?s\b/,
     '$1 <<REPLACED>>',
   );
   return summary;

diff --git a/e2e/__tests__/deadlines.ts b/e2e/__tests__/deadlines.ts
@@ -37,7 +37,7 @@ it('throws on deadline exceeded in a describe hook', () => {
 function summaryWithoutTime(result: {stderr: string}) {
   const summary = extractSummary(result.stderr);
   summary.rest = summary.rest.replace(
-    /(waited here for) \d+ms/,
+    /(waited here for) \d*\.?\d+ m?s\b/,
     '$1 <<REPLACED>>',
   );
   return summary;

diff --git a/packages/jest-circus/src/deadlineTimeout.ts b/packages/jest-circus/src/deadlineTimeout.ts
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {formatTime} from 'jest-util';
 import {getState} from './state';
 
 export function deadline(): number {
@@ -32,7 +33,7 @@ async function timeout<T>(promise: Promise<T>, ms: number): Promise<T> {
         if (await sleepCancelled) {
           return undefined as never;
         }
-        const here = new Error(`deadline exceeded (waited here for ${ms}ms)`);
+        const here = new Error(`deadline exceeded (waited here for ${formatTime(ms)})`);
         here.stack = here.stack
           ?.split('\n')
           .filter(line => !isUs(line))