diff --git a/app/server/modules/backups/__tests__/backups.patterns.test.ts b/app/server/modules/backups/__tests__/backups.patterns.test.ts index 9753efcf..df7b3cb2 100644 --- a/app/server/modules/backups/__tests__/backups.patterns.test.ts +++ b/app/server/modules/backups/__tests__/backups.patterns.test.ts @@ -1,23 +1,23 @@ -import { test, describe, mock, expect, beforeEach } from "bun:test"; +import { test, describe, mock, expect, beforeEach, afterEach, spyOn } from "bun:test"; import { backupsService } from "../backups.service"; import { createTestVolume } from "~/test/helpers/volume"; import { createTestBackupSchedule } from "~/test/helpers/backup"; import { createTestRepository } from "~/test/helpers/repository"; import { generateBackupOutput } from "~/test/helpers/restic"; import { getVolumePath } from "../../volumes/helpers"; +import { restic } from "~/server/utils/restic"; import path from "node:path"; -const backupMock = mock(() => Promise.resolve({ exitCode: 0, result: generateBackupOutput() })); - -mock.module("~/server/utils/restic", () => ({ - restic: { - backup: backupMock, - forget: mock(() => Promise.resolve()), - }, -})); +const backupMock = mock(() => Promise.resolve({ exitCode: 0, result: JSON.parse(generateBackupOutput()) })); beforeEach(() => { backupMock.mockClear(); + spyOn(restic, "backup").mockImplementation(backupMock); + spyOn(restic, "forget").mockImplementation(mock(() => Promise.resolve({ success: true }))); +}); + +afterEach(() => { + mock.restore(); }); describe("executeBackup - include / exclude patterns", () => { diff --git a/app/server/modules/backups/__tests__/backups.service.test.ts b/app/server/modules/backups/__tests__/backups.service.test.ts index 8fa5ecd7..4381a0cd 100644 --- a/app/server/modules/backups/__tests__/backups.service.test.ts +++ b/app/server/modules/backups/__tests__/backups.service.test.ts @@ -1,19 +1,20 @@ -import { test, describe, mock, expect } from "bun:test"; +import { test, describe, mock, expect, beforeEach, afterEach, spyOn } from "bun:test"; import { backupsService } from "../backups.service"; import { createTestVolume } from "~/test/helpers/volume"; import { createTestBackupSchedule } from "~/test/helpers/backup"; import { createTestRepository } from "~/test/helpers/repository"; import { generateBackupOutput } from "~/test/helpers/restic"; -import { beforeEach } from "bun:test"; +import * as spawnModule from "~/server/utils/spawn"; -const resticBackupMock = mock(() => Promise.resolve({ exitCode: 0 })); - -mock.module("~/server/utils/spawn", () => ({ - safeSpawn: resticBackupMock, -})); +const resticBackupMock = mock(() => Promise.resolve({ exitCode: 0, stdout: "", stderr: "" })); beforeEach(() => { resticBackupMock.mockClear(); + spyOn(spawnModule, "safeSpawn").mockImplementation(resticBackupMock); +}); + +afterEach(() => { + mock.restore(); }); describe("execute backup", () => {