fix: prevent running test cases timers after environment teardown

vitest-dev · Mar 7, 2023 · 23cd655 · 23cd655
1 parent 3331365
commit 23cd655
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/vitest/src/runtime/rpc.ts b/packages/vitest/src/runtime/rpc.ts
@@ -42,10 +42,6 @@ function withSafeTimers(fn: () => void) {
 const promises = new Set<Promise<unknown>>()
 
 export const rpcDone = async () => {
-  // Run possible setTimeouts, e.g. the onces used by ConsoleLogSpy
-  const { setTimeout } = getSafeTimers()
-  await new Promise(resolve => setTimeout(resolve))
-
   if (!promises.size)
     return
   const awaitable = Array.from(promises)

diff --git a/packages/vitest/src/runtime/setup.node.ts b/packages/vitest/src/runtime/setup.node.ts
@@ -183,6 +183,10 @@ export async function withEnv(
     await fn()
   }
   finally {
+    // Run possible setTimeouts, e.g. the onces used by ConsoleLogSpy
+    const { setTimeout } = getSafeTimers()
+    await new Promise(resolve => setTimeout(resolve))
+
     await env.teardown(globalThis)
   }
 }