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

test(FN-4397): annotate regression coverage for stale/live branch conflict

Browse Source 
Fusion-Task-Id: FN-4397
Fusion-Task-Lineage: 1ffac4f7-adf5-4115-b588-108d75eadde7
This commit is contained in:
Fusion
2026-05-13 15:45:57 -07:00
committed by gsxdsm
parent 381ecbfe21
commit e88b5dbb01
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/engine/src/__tests__/branch-conflicts.test.ts
View File

@@ -68,7 +68,7 @@ describe("branch-conflicts", () => {
expect(mockedExecSync).not.toHaveBeenCalled(); expect(mockedExecSync).not.toHaveBeenCalled();
}); });
it("treats branch as stale-resolved when conflicting path exists but branch is not checked out in any live worktree", async () => { it("FN-4397: treats branch as stale-resolved when conflicting path exists but branch is not checked out in any live worktree", async () => {
mockedExecSync.mockImplementation((cmd: string | string[]) => { mockedExecSync.mockImplementation((cmd: string | string[]) => {
const command = typeof cmd === "string" ? cmd : cmd[0]; const command = typeof cmd === "string" ? cmd : cmd[0];
if (command === "git worktree prune") return Buffer.from(""); if (command === "git worktree prune") return Buffer.from("");