@vitest/runner 3.1.1 → 3.1.3

package/dist/index.js

@@ -178,8 +178,8 @@ function resolveDeps(fixtures, depSet = new Set(), pendingFixtures = []) {
 }
 function getUsedProps(fn) {
 	let fnString = fn.toString();
-	if (/__async\(this, (?:null|arguments|\[[_0-9, ]*\]), function\*/.test(fnString)) {
-		fnString = fnString.split("__async(this,")[1];
+	if (/__async\((?:this|null), (?:null|arguments|\[[_0-9, ]*\]), function\*/.test(fnString)) {
+		fnString = fnString.split(/__async\((?:this|null),/)[1];
 	}
 	const match = fnString.match(/[^(]*\(([^)]*)/);
 	if (!match) {
@@ -443,7 +443,7 @@ function parseArguments(optionsOrFn, optionsOrTest) {
 		handler: fn
 	};
 }
-function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions) {
+function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions, parentCollectorFixtures) {
 	const tasks = [];
 	let suite;
 	initSuite(true);
@@ -476,14 +476,15 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 			enumerable: false
 		});
 		setTestFixture(context, options.fixtures);
+		const limit = Error.stackTraceLimit;
+		Error.stackTraceLimit = 15;
+		const stackTraceError = new Error("STACK_TRACE_ERROR");
+		Error.stackTraceLimit = limit;
 		if (handler) {
-			setFn(task, withTimeout(withAwaitAsyncAssertions(withFixtures(handler, context), task), timeout));
+			setFn(task, withTimeout(withAwaitAsyncAssertions(withFixtures(handler, context), task), timeout, false, stackTraceError));
 		}
 		if (runner.config.includeTaskLocation) {
-			const limit = Error.stackTraceLimit;
-			Error.stackTraceLimit = 15;
-			const error = new Error("stacktrace").stack;
-			Error.stackTraceLimit = limit;
+			const error = stackTraceError.stack;
 			const stack = findTestFileStackTrace(error, task.each ?? false);
 			if (stack) {
 				task.location = stack;
@@ -506,7 +507,7 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 		});
 		test.type = "test";
 	});
-	let collectorFixtures;
+	let collectorFixtures = parentCollectorFixtures;
 	const collector = {
 		type: "collector",
 		name,
@@ -620,7 +621,7 @@ function createSuite() {
 		const isSequential = isSequentialSpecified || options.sequential && !isConcurrentSpecified;
 		options.concurrent = isConcurrent && !isSequential;
 		options.sequential = isSequential && !isConcurrent;
-		return createSuiteCollector(formatName(name), factory, mode, this.each, options);
+		return createSuiteCollector(formatName(name), factory, mode, this.each, options, currentSuite === null || currentSuite === void 0 ? void 0 : currentSuite.fixtures());
 	}
 	suiteFn.each = function(cases, ...args) {
 		const suite = this.withContext();
@@ -741,10 +742,11 @@ function createTaskCollector(fn, context) {
 		return createTest(function fn(name, optionsOrFn, optionsOrTest) {
 			const collector = getCurrentSuite();
 			const scopedFixtures = collector.fixtures();
+			const context = { ...this };
 			if (scopedFixtures) {
-				this.fixtures = mergeScopedFixtures(this.fixtures || [], scopedFixtures);
+				context.fixtures = mergeScopedFixtures(context.fixtures || [], scopedFixtures);
 			}
-			collector.test.fn.call(this, formatName(name), optionsOrFn, optionsOrTest);
+			collector.test.fn.call(context, formatName(name), optionsOrFn, optionsOrTest);
 		}, _context);
 	};
 	const _test = createChainable([
@@ -1292,13 +1294,26 @@ function updateTask(event, task, runner) {
 	packs.set(task.id, [task.result, task.meta]);
 	sendTasksUpdateThrottled(runner);
 }
-async function callCleanupHooks(cleanups) {
-	await Promise.all(cleanups.map(async (fn) => {
-		if (typeof fn !== "function") {
-			return;
+async function callCleanupHooks(runner, cleanups) {
+	const sequence = runner.config.sequence.hooks;
+	if (sequence === "stack") {
+		cleanups = cleanups.slice().reverse();
+	}
+	if (sequence === "parallel") {
+		await Promise.all(cleanups.map(async (fn) => {
+			if (typeof fn !== "function") {
+				return;
+			}
+			await fn();
+		}));
+	} else {
+		for (const fn of cleanups) {
+			if (typeof fn !== "function") {
+				continue;
+			}
+			await fn();
 		}
-		await fn();
-	}));
+	}
 }
 async function runTest(test, runner) {
 	var _runner$onBeforeRunTa, _test$result, _runner$onAfterRunTas;
@@ -1358,18 +1373,6 @@ async function runTest(test, runner) {
 			} catch (e) {
 				failTask(test.result, e, runner.config.diffOptions);
 			}
-			if (((_test$result2 = test.result) === null || _test$result2 === void 0 ? void 0 : _test$result2.pending) || ((_test$result3 = test.result) === null || _test$result3 === void 0 ? void 0 : _test$result3.state) === "skip") {
-				var _test$result4;
-				test.mode = "skip";
-				test.result = {
-					state: "skip",
-					note: (_test$result4 = test.result) === null || _test$result4 === void 0 ? void 0 : _test$result4.note,
-					pending: true
-				};
-				updateTask("test-finished", test, runner);
-				setCurrentTest(undefined);
-				return;
-			}
 			try {
 				var _runner$onTaskFinishe;
 				await ((_runner$onTaskFinishe = runner.onTaskFinished) === null || _runner$onTaskFinishe === void 0 ? void 0 : _runner$onTaskFinishe.call(runner, test));
@@ -1378,7 +1381,7 @@ async function runTest(test, runner) {
 			}
 			try {
 				await callSuiteHook(suite, test, "afterEach", runner, [test.context, suite]);
-				await callCleanupHooks(beforeEachCleanups);
+				await callCleanupHooks(runner, beforeEachCleanups);
 				await callFixtureCleanup(test.context);
 			} catch (e) {
 				failTask(test.result, e, runner.config.diffOptions);
@@ -1389,6 +1392,19 @@ async function runTest(test, runner) {
 			}
 			test.onFailed = undefined;
 			test.onFinished = undefined;
+			if (((_test$result2 = test.result) === null || _test$result2 === void 0 ? void 0 : _test$result2.pending) || ((_test$result3 = test.result) === null || _test$result3 === void 0 ? void 0 : _test$result3.state) === "skip") {
+				var _test$result4;
+				test.mode = "skip";
+				test.result = {
+					state: "skip",
+					note: (_test$result4 = test.result) === null || _test$result4 === void 0 ? void 0 : _test$result4.note,
+					pending: true,
+					duration: now() - start
+				};
+				updateTask("test-finished", test, runner);
+				setCurrentTest(undefined);
+				return;
+			}
 			if (test.result.state === "pass") {
 				break;
 			}
@@ -1498,7 +1514,7 @@ async function runSuite(suite, runner) {
 		}
 		try {
 			await callSuiteHook(suite, suite, "afterAll", runner, [suite]);
-			await callCleanupHooks(beforeAllCleanups);
+			await callCleanupHooks(runner, beforeAllCleanups);
 		} catch (e) {
 			failTask(suite.result, e, runner.config.diffOptions);
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "pathe": "^2.0.3",
-    "@vitest/utils": "3.1.1"
+    "@vitest/utils": "3.1.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",