root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-5519): merge fusion/fn-5519

Browse Source
This commit is contained in:
gsxdsm
2026-05-22 22:43:26 -07:00
parent 394b9adc91
commit 3ccb132dcc
10 changed files with 88 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/engine/src/__tests__/worktree-backend.test.ts
View File

@@ -10,12 +10,13 @@ import {
} from "../worktree-backend.js";
import { activeSessionRegistry } from "../active-session-registry.js";
const { execMock, accessMock, existsSyncMock, parseIndexLockPathMock, classifyStaleLockMock, tryRemoveStaleLockMock, parseStaleRegistrationPathMock, recoverStaleRegistrationMock, installGuardMock } = vi.hoisted(() => {
const { execMock, accessMock, rmMock, existsSyncMock, parseIndexLockPathMock, classifyStaleLockMock, tryRemoveStaleLockMock, parseStaleRegistrationPathMock, recoverStaleRegistrationMock, installGuardMock } = vi.hoisted(() => {
const mock = vi.fn();
(mock as any)[Symbol.for("nodejs.util.promisify.custom")] = mock;
return {
execMock: mock,
accessMock: vi.fn(),
rmMock: vi.fn(),
existsSyncMock: vi.fn(),
parseIndexLockPathMock: vi.fn(),
classifyStaleLockMock: vi.fn(),
@@ -28,7 +29,7 @@ const { execMock, accessMock, existsSyncMock, parseIndexLockPathMock, classifySt
vi.mock("node:child_process", () => ({ exec: execMock }));
vi.mock("node:fs", () => ({ existsSync: existsSyncMock }));
vi.mock("node:fs/promises", () => ({ access: accessMock }));
vi.mock("node:fs/promises", () => ({ access: accessMock, rm: rmMock }));
vi.mock("../branch-conflicts.js", () => ({
inspectBranchConflict: vi.fn().mockResolvedValue({ kind: "stale" }),
}));
@@ -61,6 +62,8 @@ vi.mock("../worktree-stale-registration.js", () => ({
beforeEach(() => {
execMock.mockReset();
accessMock.mockReset();
rmMock.mockReset();
rmMock.mockResolvedValue(undefined as never);
existsSyncMock.mockReset();
accessMock.mockResolvedValue(undefined);
existsSyncMock.mockReturnValue(true);
@@ -113,10 +116,7 @@ describe("NativeWorktreeBackend", () => {
}),
).rejects.toThrow("guard failed");
expect(execMock).toHaveBeenCalledWith(
'rm -rf "/repo/.worktrees/fn-1"',
expect.objectContaining({ cwd: "/repo", timeout: 60000, maxBuffer: 10485760 }),
);
expect(rmMock).toHaveBeenCalledWith("/repo/.worktrees/fn-1", { recursive: true, force: true });
});
it("retries with suffix and resolves", async () => {