From ce1d95454fbdbb4caf3a2835afcd51761818252b Mon Sep 17 00:00:00 2001 From: Ayaan Zaidi Date: Mon, 16 Mar 2026 20:04:21 +0530 Subject: [PATCH] test: fix stale web search and boot-md contracts --- ...andler.gateway-startup.integration.test.ts | 13 +++++++--- src/hooks/bundled/boot-md/handler.test.ts | 13 +++++++--- src/plugins/contracts/loader.contract.test.ts | 25 ++++++------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/hooks/bundled/boot-md/handler.gateway-startup.integration.test.ts b/src/hooks/bundled/boot-md/handler.gateway-startup.integration.test.ts index 7875bd04a1d..d4d441fa687 100644 --- a/src/hooks/bundled/boot-md/handler.gateway-startup.integration.test.ts +++ b/src/hooks/bundled/boot-md/handler.gateway-startup.integration.test.ts @@ -5,12 +5,17 @@ import type { OpenClawConfig } from "../../../config/config.js"; const runBootOnce = vi.fn(); -vi.mock("../../../gateway/boot.js", () => ({ runBootOnce })); -vi.mock("../../../logging/subsystem.js", () => ({ - createSubsystemLogger: () => ({ +function createMockLogger() { + return { warn: vi.fn(), debug: vi.fn(), - }), + child: vi.fn(() => createMockLogger()), + }; +} + +vi.mock("../../../gateway/boot.js", () => ({ runBootOnce })); +vi.mock("../../../logging/subsystem.js", () => ({ + createSubsystemLogger: () => createMockLogger(), })); const { default: runBootChecklist } = await import("./handler.js"); diff --git a/src/hooks/bundled/boot-md/handler.test.ts b/src/hooks/bundled/boot-md/handler.test.ts index b212842fbae..de2abd6475f 100644 --- a/src/hooks/bundled/boot-md/handler.test.ts +++ b/src/hooks/bundled/boot-md/handler.test.ts @@ -10,16 +10,21 @@ const logDebug = vi.fn(); const MAIN_WORKSPACE_DIR = path.join(path.sep, "ws", "main"); const OPS_WORKSPACE_DIR = path.join(path.sep, "ws", "ops"); +function createMockLogger() { + return { + warn: logWarn, + debug: logDebug, + child: vi.fn(() => createMockLogger()), + }; +} + vi.mock("../../../gateway/boot.js", () => ({ runBootOnce })); vi.mock("../../../agents/agent-scope.js", () => ({ listAgentIds, resolveAgentWorkspaceDir, })); vi.mock("../../../logging/subsystem.js", () => ({ - createSubsystemLogger: () => ({ - warn: logWarn, - debug: logDebug, - }), + createSubsystemLogger: () => createMockLogger(), })); const { default: runBootChecklist } = await import("./handler.js"); diff --git a/src/plugins/contracts/loader.contract.test.ts b/src/plugins/contracts/loader.contract.test.ts index a1f82f56fda..a42c24712ec 100644 --- a/src/plugins/contracts/loader.contract.test.ts +++ b/src/plugins/contracts/loader.contract.test.ts @@ -75,15 +75,12 @@ describe("plugin loader contract", () => { webSearchProviderContractRegistry.map((entry) => entry.pluginId), ); - resolvePluginWebSearchProviders({}); + const providers = resolvePluginWebSearchProviders({}); - expect(loadOpenClawPluginsMock).toHaveBeenCalledWith( - expect.objectContaining({ - onlyPluginIds: webSearchPluginIds, - activate: false, - cache: false, - }), + expect(uniqueSortedPluginIds(providers.map((provider) => provider.pluginId))).toEqual( + webSearchPluginIds, ); + expect(loadOpenClawPluginsMock).not.toHaveBeenCalled(); }); it("keeps bundled web search allowlist compatibility wired to the web search registry", () => { @@ -91,7 +88,7 @@ describe("plugin loader contract", () => { webSearchProviderContractRegistry.map((entry) => entry.pluginId), ); - resolvePluginWebSearchProviders({ + const providers = resolvePluginWebSearchProviders({ bundledAllowlistCompat: true, config: { plugins: { @@ -100,15 +97,9 @@ describe("plugin loader contract", () => { }, }); - expect(loadOpenClawPluginsMock).toHaveBeenCalledWith( - expect.objectContaining({ - config: expect.objectContaining({ - plugins: expect.objectContaining({ - allow: expect.arrayContaining(webSearchPluginIds), - }), - }), - onlyPluginIds: webSearchPluginIds, - }), + expect(uniqueSortedPluginIds(providers.map((provider) => provider.pluginId))).toEqual( + webSearchPluginIds, ); + expect(loadOpenClawPluginsMock).not.toHaveBeenCalled(); }); });