fix: stabilize rebased full gate

This commit is contained in:
Peter Steinberger
2026-03-18 03:59:07 +00:00
parent 0cddb5fb7c
commit b5d2123156
4 changed files with 19 additions and 4 deletions

View File

@@ -25,9 +25,9 @@ vi.mock("../../../../extensions/slack/src/action-runtime.js", () => ({
handleSlackAction,
}));
let discordMessageActions: typeof import("../../../../extensions/discord/src/channel-actions.js").discordMessageActions;
let handleDiscordMessageAction: typeof import("../../../../extensions/discord/src/actions/handle-action.js").handleDiscordMessageAction;
let telegramMessageActions: typeof import("../../../../extensions/telegram/src/channel-actions.js").telegramMessageActions;
let discordMessageActions: typeof import("../../../../extensions/discord/runtime-api.js").discordMessageActions;
let handleDiscordMessageAction: typeof import("./discord/handle-action.js").handleDiscordMessageAction;
let telegramMessageActions: typeof import("../../../../extensions/telegram/runtime-api.js").telegramMessageActions;
let signalMessageActions: typeof import("../../../../extensions/signal/src/message-actions.js").signalMessageActions;
let createSlackActions: typeof import("../../../../extensions/slack/src/channel-actions.js").createSlackActions;
@@ -201,12 +201,22 @@ async function expectSlackSendRejected(params: Record<string, unknown>, error: R
beforeEach(async () => {
vi.resetModules();
<<<<<<< HEAD
({ discordMessageActions } =
await import("../../../../extensions/discord/src/channel-actions.js"));
({ handleDiscordMessageAction } =
await import("../../../../extensions/discord/src/actions/handle-action.js"));
({ telegramMessageActions } =
await import("../../../../extensions/telegram/src/channel-actions.js"));
||||||| parent of 69827439b1 (fix: stabilize rebased full gate)
({ discordMessageActions } = await import("./discord.js"));
({ handleDiscordMessageAction } = await import("./discord/handle-action.js"));
({ telegramMessageActions } = await import("./telegram.js"));
=======
({ discordMessageActions } = await import("../../../../extensions/discord/runtime-api.js"));
({ handleDiscordMessageAction } = await import("./discord/handle-action.js"));
({ telegramMessageActions } = await import("../../../../extensions/telegram/runtime-api.js"));
>>>>>>> 69827439b1 (fix: stabilize rebased full gate)
({ signalMessageActions } = await import("../../../../extensions/signal/src/message-actions.js"));
({ createSlackActions } = await import("../../../../extensions/slack/src/channel-actions.js"));
vi.clearAllMocks();