From c3292cf54c86e349d0a5a30db516a1d717d18263 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Wed, 2 Oct 2024 12:29:10 +0900 Subject: [PATCH] fix(runner): run `onTestFinished` and `onTestFailed` during `retry` and `repeats` --- packages/runner/src/run.ts | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/runner/src/run.ts b/packages/runner/src/run.ts index abcde35cc281..7b26c2d7d30e 100644 --- a/packages/runner/src/run.ts +++ b/packages/runner/src/run.ts @@ -271,6 +271,26 @@ export async function runTest(test: Test | Custom, runner: VitestRunner): Promis failTask(test.result, e, runner.config.diffOptions) } + try { + await callTaskHooks(test, test.onFinished || [], 'stack') + } + catch (e) { + failTask(test.result, e, runner.config.diffOptions) + } + + if (test.result.state === 'fail') { + try { + await callTaskHooks( + test, + test.onFailed || [], + runner.config.sequence.hooks, + ) + } + catch (e) { + failTask(test.result, e, runner.config.diffOptions) + } + } + if (test.result.state === 'pass') { break } @@ -286,26 +306,6 @@ export async function runTest(test: Test | Custom, runner: VitestRunner): Promis } } - try { - await callTaskHooks(test, test.onFinished || [], 'stack') - } - catch (e) { - failTask(test.result, e, runner.config.diffOptions) - } - - if (test.result.state === 'fail') { - try { - await callTaskHooks( - test, - test.onFailed || [], - runner.config.sequence.hooks, - ) - } - catch (e) { - failTask(test.result, e, runner.config.diffOptions) - } - } - // if test is marked to be failed, flip the result if (test.fails) { if (test.result.state === 'pass') {