fix: use suite's timeout when test.extend (#8278)

AriPerkkio · web-flow · commit 43977c2b8f09 · 2025-07-14T11:02:30.000+02:00
diff --git a/packages/runner/src/suite.ts b/packages/runner/src/suite.ts
@@ -786,7 +786,7 @@ export function createTaskCollector(
         )
       }
       const { handler, options } = parseArguments(optionsOrFn, optionsOrTest)
-      const timeout = options.timeout ?? runner?.config.testTimeout
+      const timeout = options.timeout ?? collector.options?.timeout ?? runner?.config.testTimeout
       originalWrapper.call(context, formatName(name), handler, timeout)
     }, _context)
   }
diff --git a/test/core/test/test-extend.test.ts b/test/core/test/test-extend.test.ts
@@ -487,3 +487,17 @@ describe('test.scoped repro #7813', () => {
     })
   })
 })
+
+describe('suite with timeout', () => {
+  test.extend({}).fails('should timeout', async () => {
+    await new Promise(resolve => setTimeout(resolve, 1_000))
+  })
+
+  test.extend({})('should pass', { timeout: 1_000 }, async () => {
+    await new Promise(resolve => setTimeout(resolve, 200))
+  })
+
+  test.extend({})('should also pass', async () => {
+    await new Promise(resolve => setTimeout(resolve, 1))
+  })
+}, 100)

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,7 @@ export function createTaskCollector(`
`786`	`786`	`)`
`787`	`787`	`}`
`788`	`788`	`const { handler, options } = parseArguments(optionsOrFn, optionsOrTest)`
`789`		`- const timeout = options.timeout ?? runner?.config.testTimeout`
	`789`	`+ const timeout = options.timeout ?? collector.options?.timeout ?? runner?.config.testTimeout`
`790`	`790`	`originalWrapper.call(context, formatName(name), handler, timeout)`
`791`	`791`	`}, _context)`
`792`	`792`	`}`