fix(runner): fix fixture cleanup when test times out

packages/runner/src/fixture.ts

@@ -78,49 +78,37 @@ export function withFixtures(fn: Function, testContext?: TestContext) {
     if (!pendingFixtures.length)
       return fn(context)
 
-    let cursor = 0
-
-    return new Promise((resolve, reject) => {
-      async function use(fixtureValue: any) {
-        const fixture = pendingFixtures[cursor++]
-        context![fixture.prop] = fixtureValue
-
-        if (!fixtureValueMap.has(fixture)) {
-          fixtureValueMap.set(fixture, fixtureValue)
-          cleanupFnArray.unshift(() => {
-            fixtureValueMap.delete(fixture)
+    async function resolveFixtures() {
+      for (const fixture of pendingFixtures) {
+        // fixture could be already initialized during "before" hook
+        if (fixtureValueMap.has(fixture))
+          continue
+
+        let fixtureValue: unknown
+        if (fixture.isFn) {
+          // wait for `use` call to extract fixture value
+          fixtureValue = await new Promise((resolveUseArg, rejectUseArg) => {
+            fixture.value(context, (useArg: unknown) => {
+              resolveUseArg(useArg)
+              // suspend fixture function until cleanup
+              return new Promise<void>((resolveUseReturn) => {
+                cleanupFnArray.push(resolveUseReturn)
+              })
+            }).catch(rejectUseArg) // treat fixture function error (before `use` call) as test failure
           })
         }
-
-        if (cursor < pendingFixtures.length) {
-          await next()
-        }
         else {
-          // When all fixtures setup, call the test function
-          try {
-            resolve(await fn(context))
-          }
-          catch (err) {
-            reject(err)
-          }
-          return new Promise<void>((resolve) => {
-            cleanupFnArray.push(resolve)
-          })
+          fixtureValue = fixture.value
         }
+        context![fixture.prop] = fixtureValue
+        fixtureValueMap.set(fixture, fixtureValue)
+        cleanupFnArray.unshift(() => {
+          fixtureValueMap.delete(fixture)
+        })
       }
+    }
 
-      async function next() {
-        const fixture = pendingFixtures[cursor]
-        const { isFn, value } = fixture
-        if (fixtureValueMap.has(fixture))
-          return use(fixtureValueMap.get(fixture))
-        else
-          return isFn ? value(context, use) : use(value)
-      }
-
-      const setupFixturePromise = next().catch(reject)
-      cleanupFnArray.unshift(() => setupFixturePromise)
-    })
+    return resolveFixtures().then(() => fn(context))
   }
 }
 

test/fails/fixtures/test-extend/fixture-error.test.ts

@@ -39,8 +39,7 @@ describe('error thrown in test fixtures', () => {
   myTest('fixture errors', ({ a }) => {})
 })
 
-// TODO: enable when #4669 is fixed
-describe.skip('correctly fails when test times out', () => {
+describe('correctly fails when test times out', () => {
   const myTest = test.extend<{ a: number }>({
     a: async ({}, use) => {
       await use(2)

test/fails/test/__snapshots__/runner.test.ts.snap

@@ -43,7 +43,8 @@ TypeError: failure"
 exports[`should fail test-extend/circular-dependency.test.ts > test-extend/circular-dependency.test.ts 1`] = `"Error: Circular fixture dependency detected: a <- b <- a"`;
 
 exports[`should fail test-extend/fixture-error.test.ts > test-extend/fixture-error.test.ts 1`] = `
-"Error: Error thrown in test fixture
+"Error: Test timed out in 20ms.
+Error: Error thrown in test fixture
 Error: Error thrown in afterEach fixture
 Error: Error thrown in beforeEach fixture"
 `;