diff --git a/src/commands/agents.add.e2e.test.ts b/src/commands/agents.add.e2e.test.ts index 7882fd96ed..111cc3af4b 100644 --- a/src/commands/agents.add.e2e.test.ts +++ b/src/commands/agents.add.e2e.test.ts @@ -1,23 +1,18 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; import { baseConfigSnapshot, createTestRuntime } from "./test-runtime-config-helpers.js"; -const configMocks = vi.hoisted(() => ({ - readConfigFileSnapshot: vi.fn(), - writeConfigFile: vi.fn().mockResolvedValue(undefined), -})); +const readConfigFileSnapshotMock = vi.hoisted(() => vi.fn()); +const writeConfigFileMock = vi.hoisted(() => vi.fn().mockResolvedValue(undefined)); const wizardMocks = vi.hoisted(() => ({ createClackPrompter: vi.fn(), })); -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); - return { - ...actual, - readConfigFileSnapshot: configMocks.readConfigFileSnapshot, - writeConfigFile: configMocks.writeConfigFile, - }; -}); +vi.mock("../config/config.js", async (importOriginal) => ({ + ...(await importOriginal()), + readConfigFileSnapshot: readConfigFileSnapshotMock, + writeConfigFile: writeConfigFileMock, +})); vi.mock("../wizard/clack-prompter.js", () => ({ createClackPrompter: wizardMocks.createClackPrompter, @@ -30,8 +25,8 @@ const runtime = createTestRuntime(); describe("agents add command", () => { beforeEach(() => { - configMocks.readConfigFileSnapshot.mockReset(); - configMocks.writeConfigFile.mockClear(); + readConfigFileSnapshotMock.mockReset(); + writeConfigFileMock.mockClear(); wizardMocks.createClackPrompter.mockReset(); runtime.log.mockClear(); runtime.error.mockClear(); @@ -39,17 +34,17 @@ describe("agents add command", () => { }); it("requires --workspace when flags are present", async () => { - configMocks.readConfigFileSnapshot.mockResolvedValue({ ...baseConfigSnapshot }); + readConfigFileSnapshotMock.mockResolvedValue({ ...baseConfigSnapshot }); await agentsAddCommand({ name: "Work" }, runtime, { hasFlags: true }); expect(runtime.error).toHaveBeenCalledWith(expect.stringContaining("--workspace")); expect(runtime.exit).toHaveBeenCalledWith(1); - expect(configMocks.writeConfigFile).not.toHaveBeenCalled(); + expect(writeConfigFileMock).not.toHaveBeenCalled(); }); it("requires --workspace in non-interactive mode", async () => { - configMocks.readConfigFileSnapshot.mockResolvedValue({ ...baseConfigSnapshot }); + readConfigFileSnapshotMock.mockResolvedValue({ ...baseConfigSnapshot }); await agentsAddCommand({ name: "Work", nonInteractive: true }, runtime, { hasFlags: false, @@ -57,11 +52,11 @@ describe("agents add command", () => { expect(runtime.error).toHaveBeenCalledWith(expect.stringContaining("--workspace")); expect(runtime.exit).toHaveBeenCalledWith(1); - expect(configMocks.writeConfigFile).not.toHaveBeenCalled(); + expect(writeConfigFileMock).not.toHaveBeenCalled(); }); it("exits with code 1 when the interactive wizard is cancelled", async () => { - configMocks.readConfigFileSnapshot.mockResolvedValue({ ...baseConfigSnapshot }); + readConfigFileSnapshotMock.mockResolvedValue({ ...baseConfigSnapshot }); wizardMocks.createClackPrompter.mockReturnValue({ intro: vi.fn().mockRejectedValue(new WizardCancelledError()), text: vi.fn(), @@ -73,6 +68,6 @@ describe("agents add command", () => { await agentsAddCommand({}, runtime); expect(runtime.exit).toHaveBeenCalledWith(1); - expect(configMocks.writeConfigFile).not.toHaveBeenCalled(); + expect(writeConfigFileMock).not.toHaveBeenCalled(); }); }); diff --git a/src/commands/agents.identity.e2e.test.ts b/src/commands/agents.identity.e2e.test.ts index bebd2e4dc3..8b767398ce 100644 --- a/src/commands/agents.identity.e2e.test.ts +++ b/src/commands/agents.identity.e2e.test.ts @@ -9,14 +9,11 @@ const configMocks = vi.hoisted(() => ({ writeConfigFile: vi.fn().mockResolvedValue(undefined), })); -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); - return { - ...actual, - readConfigFileSnapshot: configMocks.readConfigFileSnapshot, - writeConfigFile: configMocks.writeConfigFile, - }; -}); +vi.mock("../config/config.js", async (importOriginal) => ({ + ...(await importOriginal()), + readConfigFileSnapshot: configMocks.readConfigFileSnapshot, + writeConfigFile: configMocks.writeConfigFile, +})); import { agentsSetIdentityCommand } from "./agents.js"; diff --git a/src/commands/dashboard.e2e.test.ts b/src/commands/dashboard.e2e.test.ts index 0f32012367..cde3b5271f 100644 --- a/src/commands/dashboard.e2e.test.ts +++ b/src/commands/dashboard.e2e.test.ts @@ -1,30 +1,28 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; import { dashboardCommand } from "./dashboard.js"; -const mocks = vi.hoisted(() => ({ - readConfigFileSnapshot: vi.fn(), - resolveGatewayPort: vi.fn(), - resolveControlUiLinks: vi.fn(), - detectBrowserOpenSupport: vi.fn(), - openUrl: vi.fn(), - formatControlUiSshHint: vi.fn(), - copyToClipboard: vi.fn(), -})); +const readConfigFileSnapshotMock = vi.hoisted(() => vi.fn()); +const resolveGatewayPortMock = vi.hoisted(() => vi.fn()); +const resolveControlUiLinksMock = vi.hoisted(() => vi.fn()); +const detectBrowserOpenSupportMock = vi.hoisted(() => vi.fn()); +const openUrlMock = vi.hoisted(() => vi.fn()); +const formatControlUiSshHintMock = vi.hoisted(() => vi.fn()); +const copyToClipboardMock = vi.hoisted(() => vi.fn()); vi.mock("../config/config.js", () => ({ - readConfigFileSnapshot: mocks.readConfigFileSnapshot, - resolveGatewayPort: mocks.resolveGatewayPort, + readConfigFileSnapshot: readConfigFileSnapshotMock, + resolveGatewayPort: resolveGatewayPortMock, })); vi.mock("./onboard-helpers.js", () => ({ - resolveControlUiLinks: mocks.resolveControlUiLinks, - detectBrowserOpenSupport: mocks.detectBrowserOpenSupport, - openUrl: mocks.openUrl, - formatControlUiSshHint: mocks.formatControlUiSshHint, + resolveControlUiLinks: resolveControlUiLinksMock, + detectBrowserOpenSupport: detectBrowserOpenSupportMock, + openUrl: openUrlMock, + formatControlUiSshHint: formatControlUiSshHintMock, })); vi.mock("../infra/clipboard.js", () => ({ - copyToClipboard: mocks.copyToClipboard, + copyToClipboard: copyToClipboardMock, })); const runtime = { @@ -40,7 +38,7 @@ function resetRuntime() { } function mockSnapshot(token = "abc") { - mocks.readConfigFileSnapshot.mockResolvedValue({ + readConfigFileSnapshotMock.mockResolvedValue({ path: "/tmp/openclaw.json", exists: true, raw: "{}", @@ -50,8 +48,8 @@ function mockSnapshot(token = "abc") { issues: [], legacyIssues: [], }); - mocks.resolveGatewayPort.mockReturnValue(18789); - mocks.resolveControlUiLinks.mockReturnValue({ + resolveGatewayPortMock.mockReturnValue(18789); + resolveControlUiLinksMock.mockReturnValue({ httpUrl: "http://127.0.0.1:18789/", wsUrl: "ws://127.0.0.1:18789", }); @@ -60,31 +58,31 @@ function mockSnapshot(token = "abc") { describe("dashboardCommand", () => { beforeEach(() => { resetRuntime(); - mocks.readConfigFileSnapshot.mockReset(); - mocks.resolveGatewayPort.mockReset(); - mocks.resolveControlUiLinks.mockReset(); - mocks.detectBrowserOpenSupport.mockReset(); - mocks.openUrl.mockReset(); - mocks.formatControlUiSshHint.mockReset(); - mocks.copyToClipboard.mockReset(); + readConfigFileSnapshotMock.mockReset(); + resolveGatewayPortMock.mockReset(); + resolveControlUiLinksMock.mockReset(); + detectBrowserOpenSupportMock.mockReset(); + openUrlMock.mockReset(); + formatControlUiSshHintMock.mockReset(); + copyToClipboardMock.mockReset(); }); it("opens and copies the dashboard link by default", async () => { mockSnapshot("abc123"); - mocks.copyToClipboard.mockResolvedValue(true); - mocks.detectBrowserOpenSupport.mockResolvedValue({ ok: true }); - mocks.openUrl.mockResolvedValue(true); + copyToClipboardMock.mockResolvedValue(true); + detectBrowserOpenSupportMock.mockResolvedValue({ ok: true }); + openUrlMock.mockResolvedValue(true); await dashboardCommand(runtime); - expect(mocks.resolveControlUiLinks).toHaveBeenCalledWith({ + expect(resolveControlUiLinksMock).toHaveBeenCalledWith({ port: 18789, bind: "loopback", customBindHost: undefined, basePath: undefined, }); - expect(mocks.copyToClipboard).toHaveBeenCalledWith("http://127.0.0.1:18789/#token=abc123"); - expect(mocks.openUrl).toHaveBeenCalledWith("http://127.0.0.1:18789/#token=abc123"); + expect(copyToClipboardMock).toHaveBeenCalledWith("http://127.0.0.1:18789/#token=abc123"); + expect(openUrlMock).toHaveBeenCalledWith("http://127.0.0.1:18789/#token=abc123"); expect(runtime.log).toHaveBeenCalledWith( "Opened in your browser. Keep that tab to control OpenClaw.", ); @@ -92,27 +90,27 @@ describe("dashboardCommand", () => { it("prints SSH hint when browser cannot open", async () => { mockSnapshot("shhhh"); - mocks.copyToClipboard.mockResolvedValue(false); - mocks.detectBrowserOpenSupport.mockResolvedValue({ + copyToClipboardMock.mockResolvedValue(false); + detectBrowserOpenSupportMock.mockResolvedValue({ ok: false, reason: "ssh", }); - mocks.formatControlUiSshHint.mockReturnValue("ssh hint"); + formatControlUiSshHintMock.mockReturnValue("ssh hint"); await dashboardCommand(runtime); - expect(mocks.openUrl).not.toHaveBeenCalled(); + expect(openUrlMock).not.toHaveBeenCalled(); expect(runtime.log).toHaveBeenCalledWith("ssh hint"); }); it("respects --no-open and skips browser attempts", async () => { mockSnapshot(); - mocks.copyToClipboard.mockResolvedValue(true); + copyToClipboardMock.mockResolvedValue(true); await dashboardCommand(runtime, { noOpen: true }); - expect(mocks.detectBrowserOpenSupport).not.toHaveBeenCalled(); - expect(mocks.openUrl).not.toHaveBeenCalled(); + expect(detectBrowserOpenSupportMock).not.toHaveBeenCalled(); + expect(openUrlMock).not.toHaveBeenCalled(); expect(runtime.log).toHaveBeenCalledWith( "Browser launch disabled (--no-open). Use the URL above.", ); diff --git a/src/commands/models.list.test.ts b/src/commands/models.list.test.ts index 01ae4711a1..b41ffdc19c 100644 --- a/src/commands/models.list.test.ts +++ b/src/commands/models.list.test.ts @@ -462,18 +462,7 @@ describe("models list/status", () => { const { toModelRow } = await import("./models/list.registry.js"); const row = toModelRow({ - model: { - provider: "google-antigravity", - id: "claude-opus-4-6-thinking", - name: "Claude Opus 4.6 Thinking", - api: "google-gemini-cli", - input: ["text", "image"], - baseUrl: "https://daily-cloudcode-pa.sandbox.googleapis.com", - contextWindow: 200000, - maxTokens: 64000, - reasoning: true, - cost: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 }, - }, + model: makeGoogleAntigravityTemplate("claude-opus-4-6-thinking", "Claude Opus 4.6 Thinking"), key: "google-antigravity/claude-opus-4-6-thinking", tags: [], availableKeys: undefined, diff --git a/src/commands/onboard-interactive.e2e.test.ts b/src/commands/onboard-interactive.e2e.test.ts index 9b2e0e858c..fffa70ab9a 100644 --- a/src/commands/onboard-interactive.e2e.test.ts +++ b/src/commands/onboard-interactive.e2e.test.ts @@ -1,23 +1,13 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; import type { RuntimeEnv } from "../runtime.js"; -const mocks = vi.hoisted(() => ({ - createClackPrompter: vi.fn(), - runOnboardingWizard: vi.fn(), - restoreTerminalState: vi.fn(), -})); +const createClackPrompterMock = vi.hoisted(() => vi.fn()); +const runOnboardingWizardMock = vi.hoisted(() => vi.fn()); +const restoreTerminalStateMock = vi.hoisted(() => vi.fn()); -vi.mock("../wizard/clack-prompter.js", () => ({ - createClackPrompter: mocks.createClackPrompter, -})); - -vi.mock("../wizard/onboarding.js", () => ({ - runOnboardingWizard: mocks.runOnboardingWizard, -})); - -vi.mock("../terminal/restore.js", () => ({ - restoreTerminalState: mocks.restoreTerminalState, -})); +vi.mock("../wizard/clack-prompter.js", () => ({ createClackPrompter: createClackPrompterMock })); +vi.mock("../wizard/onboarding.js", () => ({ runOnboardingWizard: runOnboardingWizardMock })); +vi.mock("../terminal/restore.js", () => ({ restoreTerminalState: restoreTerminalStateMock })); import { WizardCancelledError } from "../wizard/prompts.js"; import { runInteractiveOnboarding } from "./onboard-interactive.js"; @@ -30,35 +20,36 @@ const runtime: RuntimeEnv = { describe("runInteractiveOnboarding", () => { beforeEach(() => { - mocks.createClackPrompter.mockReset(); - mocks.runOnboardingWizard.mockReset(); - mocks.restoreTerminalState.mockReset(); + createClackPrompterMock.mockReset(); + runOnboardingWizardMock.mockReset(); + restoreTerminalStateMock.mockReset(); runtime.log.mockClear(); runtime.error.mockClear(); runtime.exit.mockClear(); - mocks.createClackPrompter.mockReturnValue({}); + createClackPrompterMock.mockReturnValue({}); + runOnboardingWizardMock.mockResolvedValue(undefined); }); it("exits with code 1 when the wizard is cancelled", async () => { - mocks.runOnboardingWizard.mockRejectedValue(new WizardCancelledError()); + runOnboardingWizardMock.mockRejectedValue(new WizardCancelledError()); await runInteractiveOnboarding({} as never, runtime); expect(runtime.exit).toHaveBeenCalledWith(1); - expect(mocks.restoreTerminalState).toHaveBeenCalledWith("onboarding finish", { + expect(restoreTerminalStateMock).toHaveBeenCalledWith("onboarding finish", { resumeStdinIfPaused: false, }); }); it("rethrows non-cancel errors", async () => { const err = new Error("boom"); - mocks.runOnboardingWizard.mockRejectedValue(err); + runOnboardingWizardMock.mockRejectedValue(err); await expect(runInteractiveOnboarding({} as never, runtime)).rejects.toThrow("boom"); expect(runtime.exit).not.toHaveBeenCalled(); - expect(mocks.restoreTerminalState).toHaveBeenCalledWith("onboarding finish", { + expect(restoreTerminalStateMock).toHaveBeenCalledWith("onboarding finish", { resumeStdinIfPaused: false, }); });