From fb79792dc9ab2cb5cb1c3674fa9d7cecd2748138 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Wed, 25 Sep 2024 17:32:08 +0900
Subject: [PATCH] fix(runner): mark tests as skipped when `beforeAll` failed
 (#6524)

---
 packages/runner/src/run.ts                    | 20 ++++++++++++-------
 .../tests/__snapshots__/junit.test.ts.snap    |  4 +++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/runner/src/run.ts b/packages/runner/src/run.ts
index b81e9f9eb3ff..abcde35cc281 100644
--- a/packages/runner/src/run.ts
+++ b/packages/runner/src/run.ts
@@ -382,13 +382,19 @@ export async function runSuite(suite: Suite, runner: VitestRunner): Promise<void
   }
   else {
     try {
-      beforeAllCleanups = await callSuiteHook(
-        suite,
-        suite,
-        'beforeAll',
-        runner,
-        [suite],
-      )
+      try {
+        beforeAllCleanups = await callSuiteHook(
+          suite,
+          suite,
+          'beforeAll',
+          runner,
+          [suite],
+        )
+      }
+      catch (e) {
+        markTasksAsSkipped(suite, runner)
+        throw e
+      }
 
       if (runner.runSuite) {
         await runner.runSuite(suite)
diff --git a/test/reporters/tests/__snapshots__/junit.test.ts.snap b/test/reporters/tests/__snapshots__/junit.test.ts.snap
index 43756e0cbd01..31d271c4da55 100644
--- a/test/reporters/tests/__snapshots__/junit.test.ts.snap
+++ b/test/reporters/tests/__snapshots__/junit.test.ts.snap
@@ -25,10 +25,12 @@ exports[`addFileAttribute true 1`] = `
 exports[`emits <failure> when beforeAll/afterAll failed 1`] = `
 "<?xml version="1.0" encoding="UTF-8" ?>
 <testsuites name="vitest tests" tests="8" failures="2" errors="0" time="...">
-    <testsuite name="basic.test.ts" timestamp="..." hostname="..." tests="8" failures="2" errors="0" skipped="2" time="...">
+    <testsuite name="basic.test.ts" timestamp="..." hostname="..." tests="8" failures="2" errors="0" skipped="4" time="...">
         <testcase classname="basic.test.ts" name="suite with beforeAll &gt; ok 1" time="...">
+            <skipped/>
         </testcase>
         <testcase classname="basic.test.ts" name="suite with beforeAll &gt; ok 2" time="...">
+            <skipped/>
         </testcase>
         <testcase classname="basic.test.ts" name="suite with beforeAll &gt; skip 1" time="...">
             <skipped/>