From 6f8f2a012b9e0f2faf58a6c44ca2c8b501b22a41 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Fri, 3 Apr 2026 20:34:16 +0100 Subject: [PATCH] test: trim commands and cli partial mocks --- src/cli/gateway-cli/register.option-collisions.test.ts | 4 ++-- src/cli/nodes-cli.coverage.test.ts | 4 ++-- src/cli/qr-dashboard.integration.test.ts | 4 ++-- src/cli/system-cli.test.ts | 4 ++-- src/commands/agents.add.test.ts | 4 ++-- src/commands/agents.bind.commands.test.ts | 6 ++++-- src/commands/agents.identity.test.ts | 4 ++-- src/commands/auth-choice.test.ts | 7 ++++--- .../channels.adds-non-default-telegram-account.test.ts | 6 ++++-- src/commands/channels/capabilities.test.ts | 5 +++-- src/commands/configure.daemon.test.ts | 5 +++-- src/commands/flows.test.ts | 4 ++-- src/commands/gateway-status.test.ts | 5 +++-- src/commands/health.snapshot.test.ts | 5 +++-- 14 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/cli/gateway-cli/register.option-collisions.test.ts b/src/cli/gateway-cli/register.option-collisions.test.ts index 7786ab6d8bc..6492a07e76b 100644 --- a/src/cli/gateway-cli/register.option-collisions.test.ts +++ b/src/cli/gateway-cli/register.option-collisions.test.ts @@ -32,8 +32,8 @@ vi.mock("../cli-utils.js", () => ({ }, })); -vi.mock("../../runtime.js", async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock("../../runtime.js", async () => ({ + ...(await vi.importActual("../../runtime.js")), defaultRuntime: mocks.defaultRuntime, })); diff --git a/src/cli/nodes-cli.coverage.test.ts b/src/cli/nodes-cli.coverage.test.ts index 9392210c87f..b3af332827d 100644 --- a/src/cli/nodes-cli.coverage.test.ts +++ b/src/cli/nodes-cli.coverage.test.ts @@ -77,8 +77,8 @@ vi.mock("../gateway/call.js", () => ({ randomIdempotencyKey: () => randomIdempotencyKey(), })); -vi.mock("../runtime.js", async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock("../runtime.js", async () => ({ + ...(await vi.importActual("../runtime.js")), defaultRuntime: mocks.defaultRuntime, })); diff --git a/src/cli/qr-dashboard.integration.test.ts b/src/cli/qr-dashboard.integration.test.ts index 98ad662e1e6..8a063dfca72 100644 --- a/src/cli/qr-dashboard.integration.test.ts +++ b/src/cli/qr-dashboard.integration.test.ts @@ -20,8 +20,8 @@ const runtime = vi.hoisted(() => ({ exit: vi.fn<(code: number) => void>(), })); -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: loadConfigMock, diff --git a/src/cli/system-cli.test.ts b/src/cli/system-cli.test.ts index 24cb4c16707..02f84cb3591 100644 --- a/src/cli/system-cli.test.ts +++ b/src/cli/system-cli.test.ts @@ -13,8 +13,8 @@ vi.mock("./gateway-rpc.js", () => ({ callGatewayFromCli, })); -vi.mock("../runtime.js", async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock("../runtime.js", async () => ({ + ...(await vi.importActual("../runtime.js")), defaultRuntime, writeRuntimeJson: (runtime: { log: (...args: unknown[]) => void }, value: unknown, space = 2) => runtime.log(JSON.stringify(value, null, space > 0 ? space : undefined)), diff --git a/src/commands/agents.add.test.ts b/src/commands/agents.add.test.ts index f1c61288ecd..9d1d598a83a 100644 --- a/src/commands/agents.add.test.ts +++ b/src/commands/agents.add.test.ts @@ -11,8 +11,8 @@ const wizardMocks = vi.hoisted(() => ({ createClackPrompter: vi.fn(), })); -vi.mock("../config/config.js", async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock("../config/config.js", async () => ({ + ...(await vi.importActual("../config/config.js")), readConfigFileSnapshot: readConfigFileSnapshotMock, writeConfigFile: writeConfigFileMock, replaceConfigFile: replaceConfigFileMock, diff --git a/src/commands/agents.bind.commands.test.ts b/src/commands/agents.bind.commands.test.ts index 9379ef98048..2b34b8a938b 100644 --- a/src/commands/agents.bind.commands.test.ts +++ b/src/commands/agents.bind.commands.test.ts @@ -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(); +vi.mock("../channels/plugins/index.js", async () => { + const actual = await vi.importActual( + "../channels/plugins/index.js", + ); const knownChannels = new Map([ [ "discord", diff --git a/src/commands/agents.identity.test.ts b/src/commands/agents.identity.test.ts index 2663d631cab..15d1f1469ca 100644 --- a/src/commands/agents.identity.test.ts +++ b/src/commands/agents.identity.test.ts @@ -15,8 +15,8 @@ const configMocks = vi.hoisted(() => { }; }); -vi.mock("../config/config.js", async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock("../config/config.js", async () => ({ + ...(await vi.importActual("../config/config.js")), readConfigFileSnapshot: configMocks.readConfigFileSnapshot, writeConfigFile: configMocks.writeConfigFile, replaceConfigFile: configMocks.replaceConfigFile, diff --git a/src/commands/auth-choice.test.ts b/src/commands/auth-choice.test.ts index b312690c73c..b4a0cb17e22 100644 --- a/src/commands/auth-choice.test.ts +++ b/src/commands/auth-choice.test.ts @@ -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(); +vi.mock("../plugins/provider-auth-choice.runtime.js", async () => { + const actual = await vi.importActual( + "../plugins/provider-auth-choice.runtime.js", + ); return { ...actual, resolvePluginProviders, diff --git a/src/commands/channels.adds-non-default-telegram-account.test.ts b/src/commands/channels.adds-non-default-telegram-account.test.ts index e7105538ea1..528e0647303 100644 --- a/src/commands/channels.adds-non-default-telegram-account.test.ts +++ b/src/commands/channels.adds-non-default-telegram-account.test.ts @@ -13,8 +13,10 @@ const authMocks = vi.hoisted(() => ({ loadAuthProfileStore: vi.fn(), })); -vi.mock("../agents/auth-profiles.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../agents/auth-profiles.js", async () => { + const actual = await vi.importActual( + "../agents/auth-profiles.js", + ); return { ...actual, loadAuthProfileStore: authMocks.loadAuthProfileStore, diff --git a/src/commands/channels/capabilities.test.ts b/src/commands/channels/capabilities.test.ts index 3efc571762e..bdc947a887f 100644 --- a/src/commands/channels/capabilities.test.ts +++ b/src/commands/channels/capabilities.test.ts @@ -27,8 +27,9 @@ vi.mock("../../channels/plugins/index.js", () => ({ getChannelPlugin: vi.fn(), })); -vi.mock("../../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../../config/config.js", async () => { + const actual = + await vi.importActual("../../config/config.js"); return { ...actual, readConfigFileSnapshot: mocks.readConfigFileSnapshot, diff --git a/src/commands/configure.daemon.test.ts b/src/commands/configure.daemon.test.ts index ff918d936a2..d589e0cedda 100644 --- a/src/commands/configure.daemon.test.ts +++ b/src/commands/configure.daemon.test.ts @@ -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(); +vi.mock("../daemon/service.js", async () => { + const actual = + await vi.importActual("../daemon/service.js"); return { ...actual, resolveGatewayService: vi.fn(() => ({ diff --git a/src/commands/flows.test.ts b/src/commands/flows.test.ts index 0a9896d1460..acd9226e11e 100644 --- a/src/commands/flows.test.ts +++ b/src/commands/flows.test.ts @@ -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(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: vi.fn(() => ({})), diff --git a/src/commands/gateway-status.test.ts b/src/commands/gateway-status.test.ts index d36f7f9a561..58ca418140a 100644 --- a/src/commands/gateway-status.test.ts +++ b/src/commands/gateway-status.test.ts @@ -146,8 +146,9 @@ vi.mock("../infra/tailnet.js", () => ({ pickPrimaryTailnetIPv4: mocks.pickPrimaryTailnetIPv4, })); -vi.mock("../infra/ssh-tunnel.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../infra/ssh-tunnel.js", async () => { + const actual = + await vi.importActual("../infra/ssh-tunnel.js"); return { ...actual, startSshPortForward: mocks.startSshPortForward, diff --git a/src/commands/health.snapshot.test.ts b/src/commands/health.snapshot.test.ts index 9c026188030..b062297bbbc 100644 --- a/src/commands/health.snapshot.test.ts +++ b/src/commands/health.snapshot.test.ts @@ -25,8 +25,9 @@ type TelegramHealthAccount = { }; async function loadFreshHealthModulesForTest() { - vi.doMock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); + vi.doMock("../config/config.js", async () => { + const actual = + await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => testConfig,