test: trim cli and infra importActual mocks

This commit is contained in:
Peter Steinberger 2026-04-03 19:54:20 +01:00
parent 961d8eb095
commit a301e2ef87
No known key found for this signature in database
5 changed files with 24 additions and 14 deletions

View File

@ -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<typeof import("node:net")>();
vi.mock("node:net", async () => {
const actual = await vi.importActual<typeof import("node:net")>("node:net");
return { ...actual, createServer: mockCreateServer };
});

View File

@ -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<typeof import("node:child_process")>("node:child_process"),
{
spawn: vi.fn(),
},
);
});
describe("restart-helper", () => {

View File

@ -7,8 +7,10 @@ import {
installFromNpmSpecArchiveWithInstaller,
} from "./npm-pack-install.js";
vi.mock("./install-source-utils.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("./install-source-utils.js")>();
vi.mock("./install-source-utils.js", async () => {
const actual = await vi.importActual<typeof import("./install-source-utils.js")>(
"./install-source-utils.js",
);
return {
...actual,
withTempDir: vi.fn(async (_prefix: string, fn: (tmpDir: string) => Promise<unknown>) => {

View File

@ -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<typeof import("../../media/local-roots.js")>();
vi.mock("../../media/local-roots.js", async () => {
const actual = await vi.importActual<typeof import("../../media/local-roots.js")>(
"../../media/local-roots.js",
);
return {
...actual,
getDefaultMediaLocalRoots: mocks.getDefaultMediaLocalRoots,

View File

@ -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<typeof import("node:child_process")>("node:child_process"),
{
spawn,
},
);
});
const spawnMock = vi.mocked(spawn);