@vitest/runner 0.28.1 → 0.28.3

package/dist/index.js

@@ -441,19 +441,13 @@ async function runTest(test, runner) {
       await ((_d = runner.onAfterTryTest) == null ? void 0 : _d.call(runner, test, retryCount));
       test.result.state = "pass";
     } catch (e) {
-      const error = processError(e);
-      test.result.state = "fail";
-      test.result.error = error;
-      test.result.errors = [error];
+      failTask(test.result, e);
     }
     try {
       await callSuiteHook(test.suite, test, "afterEach", runner, [test.context, test.suite]);
       await callCleanupHooks(beforeEachCleanups);
     } catch (e) {
-      const error = processError(e);
-      test.result.state = "fail";
-      test.result.error = error;
-      test.result.errors = [error];
+      failTask(test.result, e);
     }
     if (test.result.state === "pass")
       break;
@@ -478,6 +472,13 @@ async function runTest(test, runner) {
   await ((_f = runner.onAfterRunTest) == null ? void 0 : _f.call(runner, test));
   updateTask(test, runner);
 }
+function failTask(result, err) {
+  result.state = "fail";
+  const error = processError(err);
+  result.error = error;
+  result.errors ?? (result.errors = []);
+  result.errors.push(error);
+}
 function markTasksAsSkipped(suite, runner) {
   suite.tasks.forEach((t) => {
     t.mode = "skip";
@@ -501,13 +502,14 @@ async function runSuite(suite, runner) {
     startTime: start
   };
   updateTask(suite, runner);
+  let beforeAllCleanups = [];
   if (suite.mode === "skip") {
     suite.result.state = "skip";
   } else if (suite.mode === "todo") {
     suite.result.state = "todo";
   } else {
     try {
-      const beforeAllCleanups = await callSuiteHook(suite, suite, "beforeAll", runner, [suite]);
+      beforeAllCleanups = await callSuiteHook(suite, suite, "beforeAll", runner, [suite]);
       if (runner.runSuite) {
         await runner.runSuite(suite);
       } else {
@@ -528,15 +530,16 @@ async function runSuite(suite, runner) {
           }
         }
       }
-      await callSuiteHook(suite, suite, "afterAll", runner, [suite]);
-      await callCleanupHooks(beforeAllCleanups);
     } catch (e) {
-      const error = processError(e);
-      suite.result.state = "fail";
-      suite.result.error = error;
-      suite.result.errors = [error];
+      failTask(suite.result, e);
     }
   }
+  try {
+    await callSuiteHook(suite, suite, "afterAll", runner, [suite]);
+    await callCleanupHooks(beforeAllCleanups);
+  } catch (e) {
+    failTask(suite.result, e);
+  }
   suite.result.duration = now() - start;
   if (suite.mode === "run") {
     if (!hasTests(suite)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "0.28.1",
+  "version": "0.28.3",
   "description": "Vitest test runner",
   "license": "MIT",
   "repository": {
@@ -35,7 +35,7 @@
   "dependencies": {
     "p-limit": "^4.0.0",
     "pathe": "^1.1.0",
-    "@vitest/utils": "0.28.1"
+    "@vitest/utils": "0.28.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",