ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: route unit ui vitest targets narrowly

Browse Source
This commit is contained in:
Shakker
2026-05-24 03:51:43 +01:00
committed by Shakker
parent deb54b5dab
commit 777402eeb5
6 changed files with 103 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/run-vitest.mjs
+36 -2
View File
@@ -1,6 +1,7 @@
import { spawn } from "node:child_process";
import { createRequire } from "node:module";
import path from "node:path";
import { isUnitUiTestTarget } from "../test/vitest/vitest.ui-paths.mjs";
import { resolveLocalVitestEnv } from "./lib/vitest-local-scheduling.mjs";
import { spawnPnpmRunner } from "./pnpm-runner.mjs";
import {
@@ -13,6 +14,7 @@ const TRUTHY_ENV_VALUES = new Set(["1", "true", "yes", "on"]);
const ANSI_CSI_PREFIX = `${String.fromCharCode(27)}[`;
const ANSI_CSI_SUFFIX_RE = /^[0-?]*[ -/]*[@-~]/u;
const SUPPRESSED_VITEST_STDERR_PATTERNS = ["[PLUGIN_TIMINGS]"];
const UNIT_UI_VITEST_CONFIG = "test/vitest/vitest.unit-ui.config.ts";
const require = createRequire(import.meta.url);
function isTruthyEnvValue(value) {
@@ -92,6 +94,31 @@ export function resolveDirectNodeVitestArgs(pnpmArgs) {
return pnpmArgs[0] === "exec" && pnpmArgs[1] === "node" ? pnpmArgs.slice(2) : null;
}
function hasExplicitVitestConfigArg(argv) {
return argv.some((arg) => arg === "--config" || arg === "-c" || arg.startsWith("--config="));
}
function toRepoRelativeArg(arg, cwd) {
const normalized = path.isAbsolute(arg) ? path.relative(cwd, arg) : arg;
return normalized.replaceAll(path.sep, "/").replace(/^\.\//u, "");
}
export function resolveImplicitVitestArgs(argv, cwd = process.cwd()) {
if (hasExplicitVitestConfigArg(argv)) {
return argv;
}
const testTargets = argv
.filter((arg) => !arg.startsWith("-") && arg.endsWith(".test.ts"))
.map((arg) => toRepoRelativeArg(arg, cwd));
if (testTargets.length === 0 || !testTargets.every(isUnitUiTestTarget)) {
return argv;
}
if (argv[0] === "run") {
return ["run", "--config", UNIT_UI_VITEST_CONFIG, ...argv.slice(1)];
}
return ["--config", UNIT_UI_VITEST_CONFIG, ...argv];
}
function spawnVitestProcess({ pnpmArgs, spawnParams }) {
const directNodeArgs = resolveDirectNodeVitestArgs(pnpmArgs);
if (directNodeArgs) {
@@ -271,11 +298,18 @@ function main(argv = process.argv.slice(2), env = process.env) {
process.exit(1);
}
const vitestArgs = resolveImplicitVitestArgs(argv);
const { child, teardown } = spawnWatchedVitestProcess({
pnpmArgs: ["exec", "node", ...resolveVitestNodeArgs(env), resolveVitestCliEntry(), ...argv],
pnpmArgs: [
"exec",
"node",
...resolveVitestNodeArgs(env),
resolveVitestCliEntry(),
...vitestArgs,
],
spawnParams: resolveVitestSpawnParams(env),
env,
label: argv.join(" "),
label: vitestArgs.join(" "),
});
child.on("exit", (code, signal) => {
scripts/test-projects.test-support.mjs
+1 -17
View File
@@ -34,6 +34,7 @@ import {
resolvePluginSdkLightIncludePattern,
} from "../test/vitest/vitest.plugin-sdk-paths.mjs";
import { fullSuiteVitestShards } from "../test/vitest/vitest.test-shards.mjs";
import { isUnitUiTestTarget } from "../test/vitest/vitest.ui-paths.mjs";
import { resolveUnitFastTestIncludePattern } from "../test/vitest/vitest.unit-fast-paths.mjs";
import {
isBoundaryTestFile,
@@ -1126,23 +1127,6 @@ function isVitestConfigTargetForKind(kind, targetArg, cwd) {
return resolveVitestConfigTargetKind(toRepoRelativeTarget(targetArg, cwd)) === kind;
}
function isUnitUiTestTarget(relative) {
if (!relative.endsWith(".test.ts")) {
return false;
}
return (
relative === "ui/src/ui/app-chat.test.ts" ||
relative.startsWith("ui/src/ui/chat/") ||
relative === "ui/src/ui/views/agents-utils.test.ts" ||
relative === "ui/src/ui/views/channels.test.ts" ||
relative === "ui/src/ui/views/chat.test.ts" ||
relative === "ui/src/ui/views/dreaming.test.ts" ||
relative === "ui/src/ui/views/usage-render-details.test.ts" ||
relative === "ui/src/ui/controllers/agents.test.ts" ||
relative === "ui/src/ui/controllers/chat.test.ts"
);
}
function isControlUiE2eTarget(relative) {
return (
relative === "ui/src/test-helpers/control-ui-e2e.ts" ||
test/scripts/run-vitest.test.ts
+35
View File
@@ -3,6 +3,7 @@ import { describe, expect, it, vi } from "vitest";
import {
installVitestNoOutputWatchdog,
resolveDirectNodeVitestArgs,
resolveImplicitVitestArgs,
resolveVitestNodeArgs,
resolveVitestNoOutputTimeoutMs,
resolveVitestSpawnParams,
@@ -26,6 +27,40 @@ describe("scripts/run-vitest", () => {
expect(resolveDirectNodeVitestArgs(["exec", "vitest", "run"])).toBeNull();
});
it("routes explicit unit ui tests through the narrow unit ui config", () => {
expect(
resolveImplicitVitestArgs([
"ui/src/ui/controllers/chat.test.ts",
"-t",
"keeps optimistic user attachment previews",
]),
).toEqual([
"--config",
"test/vitest/vitest.unit-ui.config.ts",
"ui/src/ui/controllers/chat.test.ts",
"-t",
"keeps optimistic user attachment previews",
]);
});
it("does not override explicit vitest configs", () => {
const argv = [
"--config",
"test/vitest/vitest.ui.config.ts",
"ui/src/ui/controllers/chat.test.ts",
];
expect(resolveImplicitVitestArgs(argv)).toBe(argv);
});
it("keeps the run subcommand first when routing unit ui tests", () => {
expect(resolveImplicitVitestArgs(["run", "ui/src/ui/controllers/chat.test.ts"])).toEqual([
"run",
"--config",
"test/vitest/vitest.unit-ui.config.ts",
"ui/src/ui/controllers/chat.test.ts",
]);
});
it("allows opting back into Maglev explicitly", () => {
expect(
resolveVitestNodeArgs({
test/vitest/vitest.ui-paths.mjs
+28
View File
@@ -0,0 +1,28 @@
export const unitUiIncludePatterns = [
"ui/src/ui/app-chat.test.ts",
"ui/src/ui/chat/**/*.test.ts",
"ui/src/ui/views/agents-utils.test.ts",
"ui/src/ui/views/channels.test.ts",
"ui/src/ui/views/chat.test.ts",
"ui/src/ui/views/dreaming.test.ts",
"ui/src/ui/views/usage-render-details.test.ts",
"ui/src/ui/controllers/agents.test.ts",
"ui/src/ui/controllers/chat.test.ts",
];
export function isUnitUiTestTarget(relative) {
if (!relative.endsWith(".test.ts")) {
return false;
}
return (
relative === "ui/src/ui/app-chat.test.ts" ||
relative.startsWith("ui/src/ui/chat/") ||
relative === "ui/src/ui/views/agents-utils.test.ts" ||
relative === "ui/src/ui/views/channels.test.ts" ||
relative === "ui/src/ui/views/chat.test.ts" ||
relative === "ui/src/ui/views/dreaming.test.ts" ||
relative === "ui/src/ui/views/usage-render-details.test.ts" ||
relative === "ui/src/ui/controllers/agents.test.ts" ||
relative === "ui/src/ui/controllers/chat.test.ts"
);
}
test/vitest/vitest.ui.config.ts
+1 -12
View File
@@ -1,17 +1,6 @@
import { createScopedVitestConfig } from "./vitest.scoped-config.ts";
import { jsdomOptimizedDeps } from "./vitest.shared.config.ts";
export const unitUiIncludePatterns = [
"ui/src/ui/app-chat.test.ts",
"ui/src/ui/chat/**/*.test.ts",
"ui/src/ui/views/agents-utils.test.ts",
"ui/src/ui/views/channels.test.ts",
"ui/src/ui/views/chat.test.ts",
"ui/src/ui/views/dreaming.test.ts",
"ui/src/ui/views/usage-render-details.test.ts",
"ui/src/ui/controllers/agents.test.ts",
"ui/src/ui/controllers/chat.test.ts",
];
import { unitUiIncludePatterns } from "./vitest.ui-paths.mjs";
export function createUiVitestConfig(
env?: Record<string, string | undefined>,
test/vitest/vitest.unit-ui.config.ts
+2 -1
View File
@@ -1,4 +1,5 @@
import { createUiVitestConfig, unitUiIncludePatterns } from "./vitest.ui.config.ts";
import { unitUiIncludePatterns } from "./vitest.ui-paths.mjs";
import { createUiVitestConfig } from "./vitest.ui.config.ts";
export default createUiVitestConfig(process.env, {
includePatterns: unitUiIncludePatterns,