@vitest/runner 1.1.0 → 1.1.2

package/dist/index.js

@@ -111,11 +111,12 @@ function mergeContextFixtures(fixtures, context = {}) {
   return context;
 }
 const fixtureValueMaps = /* @__PURE__ */ new Map();
-let cleanupFnArray = new Array();
-async function callFixtureCleanup() {
+const cleanupFnArrayMap = /* @__PURE__ */ new Map();
+async function callFixtureCleanup(context) {
+  const cleanupFnArray = cleanupFnArrayMap.get(context) ?? [];
   for (const cleanup of cleanupFnArray.reverse())
     await cleanup();
-  cleanupFnArray = [];
+  cleanupFnArrayMap.delete(context);
 }
 function withFixtures(fn, testContext) {
   return (hookContext) => {
@@ -131,6 +132,9 @@ function withFixtures(fn, testContext) {
     if (!fixtureValueMaps.get(context))
       fixtureValueMaps.set(context, /* @__PURE__ */ new Map());
     const fixtureValueMap = fixtureValueMaps.get(context);
+    if (!cleanupFnArrayMap.has(context))
+      cleanupFnArrayMap.set(context, []);
+    const cleanupFnArray = cleanupFnArrayMap.get(context);
     const usedFixtures = fixtures.filter(({ prop }) => usedProps.includes(prop));
     const pendingFixtures = resolveDeps(usedFixtures);
     if (!pendingFixtures.length)
@@ -139,30 +143,7 @@ function withFixtures(fn, testContext) {
       for (const fixture of pendingFixtures) {
         if (fixtureValueMap.has(fixture))
           continue;
-        let resolvedValue;
-        if (fixture.isFn) {
-          const useFnArgPromise = createDefer();
-          let isUseFnArgResolved = false;
-          const fixtureReturn = fixture.value(context, async (useFnArg) => {
-            isUseFnArgResolved = true;
-            useFnArgPromise.resolve(useFnArg);
-            const useReturnPromise = createDefer();
-            cleanupFnArray.push(async () => {
-              useReturnPromise.resolve();
-              await fixtureReturn;
-            });
-            await useReturnPromise;
-          }).catch((e) => {
-            if (!isUseFnArgResolved) {
-              useFnArgPromise.reject(e);
-              return;
-            }
-            throw e;
-          });
-          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(() => {
@@ -173,6 +154,27 @@ function withFixtures(fn, testContext) {
     return resolveFixtures().then(() => fn(context));
   };
 }
+async function resolveFixtureFunction(fixtureFn, context, cleanupFnArray) {
+  const useFnArgPromise = createDefer();
+  let isUseFnArgResolved = false;
+  const fixtureReturn = fixtureFn(context, async (useFnArg) => {
+    isUseFnArgResolved = true;
+    useFnArgPromise.resolve(useFnArg);
+    const useReturnPromise = createDefer();
+    cleanupFnArray.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))
@@ -243,7 +245,7 @@ const suite = createSuite();
 const test = createTest(
   function(name, fn, options) {
     if (getCurrentTest())
-      throw new Error("Nested tests are not allowed");
+      throw new Error('Calling the test function inside another test function is not allowed. Please put it inside "describe" or "suite" so it can be properly collected.');
     getCurrentSuite().test.fn.call(this, formatName(name), fn, options);
   }
 );
@@ -692,12 +694,13 @@ async function runTest(test, runner) {
         test.mode = "skip";
         test.result = { state: "skip" };
         updateTask(test, runner);
+        setCurrentTest(void 0);
         return;
       }
       try {
         await callSuiteHook(test.suite, test, "afterEach", runner, [test.context, test.suite]);
         await callCleanupHooks(beforeEachCleanups);
-        await callFixtureCleanup();
+        await callFixtureCleanup(test.context);
       } catch (e) {
         failTask(test.result, e, runner.config.diffOptions);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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.1.0"
+    "@vitest/utils": "1.1.2"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",