@vitest/runner 4.0.0-beta.4 → 4.0.0-beta.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-Present Vitest Team
+Copyright (c) 2021-Present VoidZero Inc. and Vitest contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/chunk-hooks.js

@@ -869,7 +869,7 @@ function createSuiteHooks() {
 }
 function parseArguments(optionsOrFn, optionsOrTest) {
 	let options = {};
-	let fn = () => {};
+	let fn;
 	// it('', () => {}, { retry: 2 })
 	if (typeof optionsOrTest === "object") {
 		// it('', { retry: 2 }, { retry: 3 })
@@ -921,6 +921,9 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 			annotations: []
 		};
 		const handler = options.handler;
+		if (task.mode === "run" && !handler) {
+			task.mode = "todo";
+		}
 		if (options.concurrent || !options.sequential && runner.config.sequence.concurrent) {
 			task.concurrent = true;
 		}
@@ -1054,7 +1057,7 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 	return collector;
 }
 function withAwaitAsyncAssertions(fn, task) {
-	return async (...args) => {
+	return (async (...args) => {
 		const fnResult = await fn(...args);
 		// some async expect will be added to this array, in case user forget to await them
 		if (task.promises) {
@@ -1065,14 +1068,17 @@ function withAwaitAsyncAssertions(fn, task) {
 			}
 		}
 		return fnResult;
-	};
+	});
 }
 function createSuite() {
 	function suiteFn(name, factoryOrOptions, optionsOrFactory) {
 		var _currentSuite$options;
-		const mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
+		let mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
 		const currentSuite = collectorContext.currentSuite || defaultSuite;
 		let { options, handler: factory } = parseArguments(factoryOrOptions, optionsOrFactory);
+		if (mode === "run" && !factory) {
+			mode = "todo";
+		}
 		const isConcurrentSpecified = options.concurrent || this.concurrent || options.sequential === false;
 		const isSequentialSpecified = options.sequential || this.sequential || options.concurrent === false;
 		// inherit options from current suite
@@ -1103,15 +1109,15 @@ function createSuite() {
 				const items = Array.isArray(i) ? i : [i];
 				if (fnFirst) {
 					if (arrayOnlyCases) {
-						suite(formatTitle(_name, items, idx), () => handler(...items), options);
+						suite(formatTitle(_name, items, idx), handler ? () => handler(...items) : undefined, options);
 					} else {
-						suite(formatTitle(_name, items, idx), () => handler(i), options);
+						suite(formatTitle(_name, items, idx), handler ? () => handler(i) : undefined, options);
 					}
 				} else {
 					if (arrayOnlyCases) {
-						suite(formatTitle(_name, items, idx), options, () => handler(...items));
+						suite(formatTitle(_name, items, idx), options, handler ? () => handler(...items) : undefined);
 					} else {
-						suite(formatTitle(_name, items, idx), options, () => handler(i));
+						suite(formatTitle(_name, items, idx), options, handler ? () => handler(i) : undefined);
 					}
 				}
 			});
@@ -1126,7 +1132,7 @@ function createSuite() {
 			const name_ = formatName(name);
 			const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
 			cases.forEach((item, idx) => {
-				suite(formatTitle(name_, toArray(item), idx), options, () => handler(item));
+				suite(formatTitle(name_, toArray(item), idx), options, handler ? () => handler(item) : undefined);
 			});
 		};
 	};
@@ -1158,15 +1164,15 @@ function createTaskCollector(fn, context) {
 				const items = Array.isArray(i) ? i : [i];
 				if (fnFirst) {
 					if (arrayOnlyCases) {
-						test(formatTitle(_name, items, idx), () => handler(...items), options);
+						test(formatTitle(_name, items, idx), handler ? () => handler(...items) : undefined, options);
 					} else {
-						test(formatTitle(_name, items, idx), () => handler(i), options);
+						test(formatTitle(_name, items, idx), handler ? () => handler(i) : undefined, options);
 					}
 				} else {
 					if (arrayOnlyCases) {
-						test(formatTitle(_name, items, idx), options, () => handler(...items));
+						test(formatTitle(_name, items, idx), options, handler ? () => handler(...items) : undefined);
 					} else {
-						test(formatTitle(_name, items, idx), options, () => handler(i));
+						test(formatTitle(_name, items, idx), options, handler ? () => handler(i) : undefined);
 					}
 				}
 			});
@@ -1183,9 +1189,11 @@ function createTaskCollector(fn, context) {
 			const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
 			cases.forEach((item, idx) => {
 				// monkey-patch handler to allow parsing fixture
-				const handlerWrapper = (ctx) => handler(item, ctx);
-				handlerWrapper.__VITEST_FIXTURE_INDEX__ = 1;
-				handlerWrapper.toString = () => handler.toString();
+				const handlerWrapper = handler ? (ctx) => handler(item, ctx) : undefined;
+				if (handlerWrapper) {
+					handlerWrapper.__VITEST_FIXTURE_INDEX__ = 1;
+					handlerWrapper.toString = () => handler.toString();
+				}
 				test(formatTitle(_name, toArray(item), idx), options, handlerWrapper);
 			});
 		};
@@ -1855,7 +1863,7 @@ function withTimeout(fn, timeout, isHook = false, stackTraceError, onTimeout) {
 	}
 	const { setTimeout, clearTimeout } = getSafeTimers();
 	// this function name is used to filter error in test/cli/test/fails.test.ts
-	return function runWithTimeout(...args) {
+	return (function runWithTimeout(...args) {
 		const startTime = now();
 		const runner = getRunner();
 		runner._currentTaskStartTime = startTime;
@@ -1908,7 +1916,7 @@ catch (error) {
 				reject(error);
 			}
 		});
-	};
+	});
 }
 const abortControllers = new WeakMap();
 function abortIfTimeout([context], error) {
@@ -1970,7 +1978,7 @@ function createTestContext(test, runner) {
 		test.annotations.push(resolvedAnnotation);
 		return resolvedAnnotation;
 	}
-	context.annotate = (message, type, attachment) => {
+	context.annotate = ((message, type, attachment) => {
 		if (test.result && test.result.state !== "run") {
 			throw new Error(`Cannot annotate tests outside of the test run. The test "${test.name}" finished running with the "${test.result.state}" state already.`);
 		}
@@ -1988,7 +1996,7 @@ function createTestContext(test, runner) {
 		} else {
 			return recordAsyncAnnotation(test, annotate(message, location, type, attachment));
 		}
-	};
+	});
 	context.onTestFailed = (handler, timeout) => {
 		test.onFailed || (test.onFailed = []);
 		test.onFailed.push(withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR"), (_, error) => abortController.abort(error)));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -40,7 +40,7 @@
   "dependencies": {
     "pathe": "^2.0.3",
     "strip-literal": "^3.0.0",
-    "@vitest/utils": "4.0.0-beta.4"
+    "@vitest/utils": "4.0.0-beta.6"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",