test: trim commands and cli partial mocks

This commit is contained in:
Peter Steinberger 2026-04-03 20:34:16 +01:00
parent f7f467b042
commit 6f8f2a012b
No known key found for this signature in database
14 changed files with 38 additions and 29 deletions

View File

@ -32,8 +32,8 @@ vi.mock("../cli-utils.js", () => ({
},
}));
vi.mock("../../runtime.js", async (importOriginal) => ({
...(await importOriginal<typeof import("../../runtime.js")>()),
vi.mock("../../runtime.js", async () => ({
...(await vi.importActual<typeof import("../../runtime.js")>("../../runtime.js")),
defaultRuntime: mocks.defaultRuntime,
}));

View File

@ -77,8 +77,8 @@ vi.mock("../gateway/call.js", () => ({
randomIdempotencyKey: () => randomIdempotencyKey(),
}));
vi.mock("../runtime.js", async (importOriginal) => ({
...(await importOriginal<typeof import("../runtime.js")>()),
vi.mock("../runtime.js", async () => ({
...(await vi.importActual<typeof import("../runtime.js")>("../runtime.js")),
defaultRuntime: mocks.defaultRuntime,
}));

View File

@ -20,8 +20,8 @@ const runtime = vi.hoisted<RuntimeEnv>(() => ({
exit: vi.fn<(code: number) => void>(),
}));
vi.mock("../config/config.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../config/config.js")>();
vi.mock("../config/config.js", async () => {
const actual = await vi.importActual<typeof import("../config/config.js")>("../config/config.js");
return {
...actual,
loadConfig: loadConfigMock,

View File

@ -13,8 +13,8 @@ vi.mock("./gateway-rpc.js", () => ({
callGatewayFromCli,
}));
vi.mock("../runtime.js", async (importOriginal) => ({
...(await importOriginal<typeof import("../runtime.js")>()),
vi.mock("../runtime.js", async () => ({
...(await vi.importActual<typeof import("../runtime.js")>("../runtime.js")),
defaultRuntime,
writeRuntimeJson: (runtime: { log: (...args: unknown[]) => void }, value: unknown, space = 2) =>
runtime.log(JSON.stringify(value, null, space > 0 ? space : undefined)),

View File

@ -11,8 +11,8 @@ const wizardMocks = vi.hoisted(() => ({
createClackPrompter: vi.fn(),
}));
vi.mock("../config/config.js", async (importOriginal) => ({
...(await importOriginal<typeof import("../config/config.js")>()),
vi.mock("../config/config.js", async () => ({
...(await vi.importActual<typeof import("../config/config.js")>("../config/config.js")),
readConfigFileSnapshot: readConfigFileSnapshotMock,
writeConfigFile: writeConfigFileMock,
replaceConfigFile: replaceConfigFileMock,

View File

@ -9,8 +9,10 @@ import {
} from "./agents.bind.test-support.js";
import { baseConfigSnapshot } from "./test-runtime-config-helpers.js";
vi.mock("../channels/plugins/index.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../channels/plugins/index.js")>();
vi.mock("../channels/plugins/index.js", async () => {
const actual = await vi.importActual<typeof import("../channels/plugins/index.js")>(
"../channels/plugins/index.js",
);
const knownChannels = new Map([
[
"discord",

View File

@ -15,8 +15,8 @@ const configMocks = vi.hoisted(() => {
};
});
vi.mock("../config/config.js", async (importOriginal) => ({
...(await importOriginal<typeof import("../config/config.js")>()),
vi.mock("../config/config.js", async () => ({
...(await vi.importActual<typeof import("../config/config.js")>("../config/config.js")),
readConfigFileSnapshot: configMocks.readConfigFileSnapshot,
writeConfigFile: configMocks.writeConfigFile,
replaceConfigFile: configMocks.replaceConfigFile,

View File

@ -34,9 +34,10 @@ vi.mock("./openai-codex-oauth.js", () => ({
}));
const resolvePluginProviders = vi.hoisted(() => vi.fn<() => ProviderPlugin[]>(() => []));
vi.mock("../plugins/provider-auth-choice.runtime.js", async (importOriginal) => {
const actual =
await importOriginal<typeof import("../plugins/provider-auth-choice.runtime.js")>();
vi.mock("../plugins/provider-auth-choice.runtime.js", async () => {
const actual = await vi.importActual<typeof import("../plugins/provider-auth-choice.runtime.js")>(
"../plugins/provider-auth-choice.runtime.js",
);
return {
...actual,
resolvePluginProviders,

View File

@ -13,8 +13,10 @@ const authMocks = vi.hoisted(() => ({
loadAuthProfileStore: vi.fn(),
}));
vi.mock("../agents/auth-profiles.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../agents/auth-profiles.js")>();
vi.mock("../agents/auth-profiles.js", async () => {
const actual = await vi.importActual<typeof import("../agents/auth-profiles.js")>(
"../agents/auth-profiles.js",
);
return {
...actual,
loadAuthProfileStore: authMocks.loadAuthProfileStore,

View File

@ -27,8 +27,9 @@ vi.mock("../../channels/plugins/index.js", () => ({
getChannelPlugin: vi.fn(),
}));
vi.mock("../../config/config.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../../config/config.js")>();
vi.mock("../../config/config.js", async () => {
const actual =
await vi.importActual<typeof import("../../config/config.js")>("../../config/config.js");
return {
...actual,
readConfigFileSnapshot: mocks.readConfigFileSnapshot,

View File

@ -50,8 +50,9 @@ vi.mock("./daemon-runtime.js", () => ({
GATEWAY_DAEMON_RUNTIME_OPTIONS: [{ value: "node", label: "Node" }],
}));
vi.mock("../daemon/service.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../daemon/service.js")>();
vi.mock("../daemon/service.js", async () => {
const actual =
await vi.importActual<typeof import("../daemon/service.js")>("../daemon/service.js");
return {
...actual,
resolveGatewayService: vi.fn(() => ({

View File

@ -12,8 +12,8 @@ import {
import { withTempDir } from "../test-helpers/temp-dir.js";
import { flowsCancelCommand, flowsListCommand, flowsShowCommand } from "./flows.js";
vi.mock("../config/config.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../config/config.js")>();
vi.mock("../config/config.js", async () => {
const actual = await vi.importActual<typeof import("../config/config.js")>("../config/config.js");
return {
...actual,
loadConfig: vi.fn(() => ({})),

View File

@ -146,8 +146,9 @@ vi.mock("../infra/tailnet.js", () => ({
pickPrimaryTailnetIPv4: mocks.pickPrimaryTailnetIPv4,
}));
vi.mock("../infra/ssh-tunnel.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../infra/ssh-tunnel.js")>();
vi.mock("../infra/ssh-tunnel.js", async () => {
const actual =
await vi.importActual<typeof import("../infra/ssh-tunnel.js")>("../infra/ssh-tunnel.js");
return {
...actual,
startSshPortForward: mocks.startSshPortForward,

View File

@ -25,8 +25,9 @@ type TelegramHealthAccount = {
};
async function loadFreshHealthModulesForTest() {
vi.doMock("../config/config.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("../config/config.js")>();
vi.doMock("../config/config.js", async () => {
const actual =
await vi.importActual<typeof import("../config/config.js")>("../config/config.js");
return {
...actual,
loadConfig: () => testConfig,