fix: prevent running test cases timers after environment teardown (#2971

)

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)

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)
   }
 }

test/core/test/dom.test.ts

@@ -171,3 +171,19 @@ it('doesn\'t throw, if listening for error', () => {
   dispatchEvent(new Event('custom'))
   expect(spy).toHaveBeenCalled()
 })
+
+it('timers are not run after environment teardown', async () => {
+  setInterval(() => {
+    try {
+      window.document.createElement('div')
+    }
+    catch (err) {
+      if (/window is not defined/.test((err as any).message))
+        throw new Error('setInterval was called after environment teardown')
+
+      throw err
+    }
+  }, 1)
+
+  expect(window.document).toBeDefined()
+})

test/watch/test/stdout.test.ts

@@ -0,0 +1,32 @@
+import { readFileSync, writeFileSync } from 'fs'
+import { afterEach, expect, test } from 'vitest'
+
+import { startWatchMode, waitFor } from './utils'
+
+const testFile = 'fixtures/math.test.ts'
+const testFileContent = readFileSync(testFile, 'utf-8')
+
+afterEach(() => {
+  writeFileSync(testFile, testFileContent, 'utf8')
+})
+
+test('console.log is visible on test re-run', async () => {
+  const vitest = await startWatchMode()
+  const testCase = `
+test('test with logging', () => {
+  console.log('First')
+  console.log('Second')
+  console.log('Third')
+  expect(true).toBe(true)
+})
+`
+
+  writeFileSync(testFile, `${testFileContent}${testCase}`, 'utf8')
+
+  await waitFor(() => {
+    expect(vitest.getOutput()).toMatch('stdout | math.test.ts > test with logging')
+    expect(vitest.getOutput()).toMatch('First')
+    expect(vitest.getOutput()).toMatch('Second')
+    expect(vitest.getOutput()).toMatch('Third')
+  })
+})