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

feat(FN-4717): complete Step 2 — add backend resolver precedence

Browse Source 
Fusion-Task-Id: FN-4717
Fusion-Task-Lineage: a2533cd8-52c4-43a0-9daf-e0a49745306b
This commit is contained in:
Fusion (runfusion.ai)
2026-05-16 01:48:47 -07:00
committed by gsxdsm
parent e21e72884b
commit f02482f8f3
2 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,6 +608,57 @@ describe("resolveWorktreeBackend", () => {
expect(resolveWorktreeBackend({ worktrunk: { enabled: true, binaryPath: "worktrunk" } as any }).kind).toBe("worktrunk");
});
it("uses literal binaryPath over resolver when both are provided", async () => {
execMock.mockResolvedValue({ stdout: "", stderr: "" });
const resolver = vi.fn().mockResolvedValue("/resolved");
const backend = resolveWorktreeBackend(
{ worktrunk: { enabled: true, binaryPath: " /literal " } as any },
{ binaryPathResolver: resolver },
);
await (backend as WorktrunkWorktreeBackend).remove({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
});
expect(resolver).not.toHaveBeenCalled();
expect(execMock).toHaveBeenCalledWith(
'"/literal" "remove" "--foreground" "fusion/fn-1"',
expect.objectContaining({ cwd: "/repo" }),
);
});
it("wires binaryPathResolver when literal is absent", async () => {
execMock.mockResolvedValue({ stdout: "", stderr: "" });
const resolver = vi.fn().mockResolvedValue("/resolved");
const backend = resolveWorktreeBackend({ worktrunk: { enabled: true } as any }, { binaryPathResolver: resolver });
await (backend as WorktrunkWorktreeBackend).remove({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
});
expect(resolver).toHaveBeenCalledTimes(1);
expect(execMock).toHaveBeenCalledWith(
'"/resolved" "remove" "--foreground" "fusion/fn-1"',
expect.objectContaining({ cwd: "/repo" }),
);
});
it("preserves null behavior when literal and resolver are absent", async () => {
const backend = resolveWorktreeBackend({ worktrunk: { enabled: true } as any });
await expect(
(backend as WorktrunkWorktreeBackend).remove({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
}),
).rejects.toMatchObject({ code: "worktrunk_binary_missing", operation: "remove" });
});
it("uses worktrunk when enabled without binaryPath", () => {
expect(resolveWorktreeBackend({ worktrunk: { enabled: true } as any }).kind).toBe("worktrunk");
});