diff --git a/src/cli/ports.test.ts b/src/cli/ports.test.ts index 082dfa09a12..26761d59f06 100644 --- a/src/cli/ports.test.ts +++ b/src/cli/ports.test.ts @@ -5,8 +5,8 @@ import { describe, expect, it, vi } from "vitest"; // Hoist the factory so vi.mock can access it. const mockCreateServer = vi.hoisted(() => vi.fn()); -vi.mock("node:net", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("node:net", async () => { + const actual = await vi.importActual("node:net"); return { ...actual, createServer: mockCreateServer }; }); diff --git a/src/cli/update-cli/restart-helper.test.ts b/src/cli/update-cli/restart-helper.test.ts index e45b7c751c5..cba22205262 100644 --- a/src/cli/update-cli/restart-helper.test.ts +++ b/src/cli/update-cli/restart-helper.test.ts @@ -3,11 +3,14 @@ import fs from "node:fs/promises"; import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; import { prepareRestartScript, runRestartScript } from "./restart-helper.js"; -vi.mock("node:child_process", async (importOriginal) => { +vi.mock("node:child_process", async () => { const { mockNodeBuiltinModule } = await import("../../../test/helpers/node-builtin-mocks.js"); - return mockNodeBuiltinModule(importOriginal, { - spawn: vi.fn(), - }); + return mockNodeBuiltinModule( + () => vi.importActual("node:child_process"), + { + spawn: vi.fn(), + }, + ); }); describe("restart-helper", () => { diff --git a/src/infra/npm-pack-install.test.ts b/src/infra/npm-pack-install.test.ts index 94d732deef6..e0e5f7e2c07 100644 --- a/src/infra/npm-pack-install.test.ts +++ b/src/infra/npm-pack-install.test.ts @@ -7,8 +7,10 @@ import { installFromNpmSpecArchiveWithInstaller, } from "./npm-pack-install.js"; -vi.mock("./install-source-utils.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./install-source-utils.js", async () => { + const actual = await vi.importActual( + "./install-source-utils.js", + ); return { ...actual, withTempDir: vi.fn(async (_prefix: string, fn: (tmpDir: string) => Promise) => { diff --git a/src/infra/outbound/outbound-send-service.test.ts b/src/infra/outbound/outbound-send-service.test.ts index 4a7dc931bb4..e330530374e 100644 --- a/src/infra/outbound/outbound-send-service.test.ts +++ b/src/infra/outbound/outbound-send-service.test.ts @@ -62,8 +62,10 @@ vi.mock("../../media/read-capability.js", () => ({ resolveAgentScopedOutboundMediaAccess: mocks.resolveAgentScopedOutboundMediaAccess, })); -vi.mock("../../media/local-roots.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../../media/local-roots.js", async () => { + const actual = await vi.importActual( + "../../media/local-roots.js", + ); return { ...actual, getDefaultMediaLocalRoots: mocks.getDefaultMediaLocalRoots, diff --git a/src/infra/ssh-config.test.ts b/src/infra/ssh-config.test.ts index db1c34255da..5829d32b465 100644 --- a/src/infra/ssh-config.test.ts +++ b/src/infra/ssh-config.test.ts @@ -16,7 +16,7 @@ function createMockSpawnChild() { return { child, stdout }; } -vi.mock("node:child_process", async (importOriginal) => { +vi.mock("node:child_process", async () => { const { mockNodeBuiltinModule } = await import("../../test/helpers/node-builtin-mocks.js"); const spawn = vi.fn(() => { const { child, stdout } = createMockSpawnChild(); @@ -36,9 +36,12 @@ vi.mock("node:child_process", async (importOriginal) => { }); return child; }); - return mockNodeBuiltinModule(importOriginal, { - spawn, - }); + return mockNodeBuiltinModule( + () => vi.importActual("node:child_process"), + { + spawn, + }, + ); }); const spawnMock = vi.mocked(spawn);