@vitest/runner 1.0.4 → 1.1.1

package/dist/index.js

@@ -139,22 +139,7 @@ function withFixtures(fn, testContext) {
       for (const fixture of pendingFixtures) {
         if (fixtureValueMap.has(fixture))
           continue;
-        let resolvedValue;
-        if (fixture.isFn) {
-          const useFnArgPromise = createDefer();
-          const fixtureReturn = fixture.value(context, async (useFnArg) => {
-            useFnArgPromise.resolve(useFnArg);
-            const useReturnPromise = createDefer();
-            cleanupFnArray.push(async () => {
-              useReturnPromise.resolve();
-              await fixtureReturn;
-            });
-            await useReturnPromise;
-          }).catch(useFnArgPromise.reject);
-          resolvedValue = await useFnArgPromise;
-        } else {
-          resolvedValue = fixture.value;
-        }
+        const resolvedValue = fixture.isFn ? await resolveFixtureFunction(fixture.value, context, cleanupFnArray) : fixture.value;
         context[fixture.prop] = resolvedValue;
         fixtureValueMap.set(fixture, resolvedValue);
         cleanupFnArray.unshift(() => {
@@ -165,6 +150,27 @@ function withFixtures(fn, testContext) {
     return resolveFixtures().then(() => fn(context));
   };
 }
+async function resolveFixtureFunction(fixtureFn, context, cleanupFnArray2) {
+  const useFnArgPromise = createDefer();
+  let isUseFnArgResolved = false;
+  const fixtureReturn = fixtureFn(context, async (useFnArg) => {
+    isUseFnArgResolved = true;
+    useFnArgPromise.resolve(useFnArg);
+    const useReturnPromise = createDefer();
+    cleanupFnArray2.push(async () => {
+      useReturnPromise.resolve();
+      await fixtureReturn;
+    });
+    await useReturnPromise;
+  }).catch((e) => {
+    if (!isUseFnArgResolved) {
+      useFnArgPromise.reject(e);
+      return;
+    }
+    throw e;
+  });
+  return useFnArgPromise;
+}
 function resolveDeps(fixtures, depSet = /* @__PURE__ */ new Set(), pendingFixtures = []) {
   fixtures.forEach((fixture) => {
     if (pendingFixtures.includes(fixture))
@@ -684,6 +690,7 @@ async function runTest(test, runner) {
         test.mode = "skip";
         test.result = { state: "skip" };
         updateTask(test, runner);
+        setCurrentTest(void 0);
         return;
       }
       try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.1.1",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -40,7 +40,7 @@
   "dependencies": {
     "p-limit": "^5.0.0",
     "pathe": "^1.1.1",
-    "@vitest/utils": "1.0.4"
+    "@vitest/utils": "1.1.1"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",