@vitest/runner 0.34.0 → 0.34.2

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { VitestRunner } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';
-import { T as Task, F as File, d as SuiteAPI, e as TestAPI, f as SuiteCollector, g as SuiteHooks, O as OnTestFailedHandler, a as Test } from './tasks-abce80cc.js';
-export { D as DoneCallback, o as Fixtures, p as HookCleanupCallback, H as HookListener, R as RunMode, r as RuntimeContext, t as SequenceHooks, u as SequenceSetupFiles, S as Suite, q as SuiteFactory, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, l as TaskResultPack, h as TaskState, s as TestContext, m as TestFunction, n as TestOptions } from './tasks-abce80cc.js';
+import { T as Task, F as File, d as SuiteAPI, e as TestAPI, f as SuiteCollector, g as SuiteHooks, O as OnTestFailedHandler, a as Test } from './tasks-e594cd24.js';
+export { D as DoneCallback, o as Fixtures, p as HookCleanupCallback, H as HookListener, R as RunMode, r as RuntimeContext, t as SequenceHooks, u as SequenceSetupFiles, S as Suite, q as SuiteFactory, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, l as TaskResultPack, h as TaskState, s as TestContext, m as TestFunction, n as TestOptions } from './tasks-e594cd24.js';
 import { Awaitable } from '@vitest/utils';
 
 declare function updateTask(task: Task, runner: VitestRunner): void;

package/dist/index.js

@@ -19,6 +19,16 @@ function getHooks(key) {
   return hooksMap.get(key);
 }
 
+class PendingError extends Error {
+  constructor(message, task) {
+    super(message);
+    this.message = message;
+    this.taskId = task.id;
+  }
+  code = "VITEST_PENDING";
+  taskId;
+}
+
 const collectorContext = {
   tasks: [],
   currentSuite: null
@@ -55,6 +65,10 @@ function createTestContext(test, runner) {
   };
   context.meta = test;
   context.task = test;
+  context.skip = () => {
+    test.pending = true;
+    throw new PendingError("test is skipped; abort execution", test);
+  };
   context.onTestFailed = (fn) => {
     test.onFailed || (test.onFailed = []);
     test.onFailed.push(fn);
@@ -565,7 +579,7 @@ async function callCleanupHooks(cleanups) {
   }));
 }
 async function runTest(test, runner) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   await ((_a = runner.onBeforeRunTest) == null ? void 0 : _a.call(runner, test));
   if (test.mode !== "run")
     return;
@@ -614,6 +628,12 @@ async function runTest(test, runner) {
       } catch (e) {
         failTask(test.result, e);
       }
+      if (test.pending || ((_e = test.result) == null ? void 0 : _e.state) === "skip") {
+        test.mode = "skip";
+        test.result = { state: "skip" };
+        updateTask(test, runner);
+        return;
+      }
       try {
         await callSuiteHook(test.suite, test, "afterEach", runner, [test.context, test.suite]);
         await callCleanupHooks(beforeEachCleanups);
@@ -630,7 +650,7 @@ async function runTest(test, runner) {
     }
   }
   if (test.result.state === "fail")
-    await Promise.all(((_e = test.onFailed) == null ? void 0 : _e.map((fn) => fn(test.result))) || []);
+    await Promise.all(((_f = test.onFailed) == null ? void 0 : _f.map((fn) => fn(test.result))) || []);
   if (test.fails) {
     if (test.result.state === "pass") {
       const error = processError(new Error("Expect test to fail"));
@@ -645,10 +665,14 @@ async function runTest(test, runner) {
   }
   setCurrentTest(void 0);
   test.result.duration = now() - start;
-  await ((_f = runner.onAfterRunTest) == null ? void 0 : _f.call(runner, test));
+  await ((_g = runner.onAfterRunTest) == null ? void 0 : _g.call(runner, test));
   updateTask(test, runner);
 }
 function failTask(result, err) {
+  if (err instanceof PendingError) {
+    result.state = "skip";
+    return;
+  }
   result.state = "fail";
   const errors = Array.isArray(err) ? err : [err];
   for (const e of errors) {

package/dist/{tasks-abce80cc.d.ts → tasks-e594cd24.d.ts}

@@ -60,6 +60,7 @@ interface File extends Suite {
 interface Test<ExtraContext = {}> extends TaskBase {
     type: 'test';
     suite: Suite;
+    pending?: boolean;
     result?: TaskResult;
     fails?: boolean;
     context: TestContext & ExtraContext;
@@ -190,6 +191,10 @@ interface TestContext {
      * Extract hooks on test failed
      */
     onTestFailed: (fn: OnTestFailedHandler) => void;
+    /**
+     * Mark tests as skipped. All execution after this call will be skipped.
+     */
+    skip: () => void;
 }
 type OnTestFailedHandler = (result: TaskResult) => Awaitable<void>;
 type SequenceHooks = 'stack' | 'list' | 'parallel';

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { t as SequenceHooks, u as SequenceSetupFiles, F as File, a as Test, S as Suite, l as TaskResultPack, s as TestContext } from './tasks-abce80cc.js';
-export { D as DoneCallback, o as Fixtures, p as HookCleanupCallback, H as HookListener, O as OnTestFailedHandler, R as RunMode, r as RuntimeContext, d as SuiteAPI, f as SuiteCollector, q as SuiteFactory, g as SuiteHooks, T as Task, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, h as TaskState, e as TestAPI, m as TestFunction, n as TestOptions } from './tasks-abce80cc.js';
+import { t as SequenceHooks, u as SequenceSetupFiles, F as File, a as Test, S as Suite, l as TaskResultPack, s as TestContext } from './tasks-e594cd24.js';
+export { D as DoneCallback, o as Fixtures, p as HookCleanupCallback, H as HookListener, O as OnTestFailedHandler, R as RunMode, r as RuntimeContext, d as SuiteAPI, f as SuiteCollector, q as SuiteFactory, g as SuiteHooks, T as Task, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, h as TaskState, e as TestAPI, m as TestFunction, n as TestOptions } from './tasks-e594cd24.js';
 import '@vitest/utils';
 
 interface VitestRunnerConfig {

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, T as Task, a as Test, b as TaskCustom } from './tasks-abce80cc.js';
-export { C as ChainableFunction, c as createChainable } from './tasks-abce80cc.js';
+import { S as Suite, T as Task, a as Test, b as TaskCustom } from './tasks-e594cd24.js';
+export { C as ChainableFunction, c as createChainable } from './tasks-e594cd24.js';
 import { Arrayable } from '@vitest/utils';
 
 /**

package/dist/utils.js

@@ -124,7 +124,21 @@ function isAtomTest(s) {
   return s.type === "test" || s.type === "custom";
 }
 function getTests(suite) {
-  return toArray(suite).flatMap((s) => isAtomTest(s) ? [s] : s.tasks.flatMap((c) => isAtomTest(c) ? [c] : getTests(c)));
+  const tests = [];
+  const suite_arr = toArray(suite);
+  for (const s of suite_arr) {
+    if (isAtomTest(s)) {
+      tests.push(s);
+    } else {
+      for (const task of s.tasks) {
+        if (isAtomTest(task))
+          tests.push(task);
+        else
+          tests.push(...getTests(task));
+      }
+    }
+  }
+  return tests;
 }
 function getTasks(tasks = []) {
   return toArray(tasks).flatMap((s) => isAtomTest(s) ? [s] : [s, ...getTasks(s.tasks)]);

package/package.json

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