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

test(FN-4424): complete Step 5 — cover empty cherry-pick real-git cases

Browse Source 
Fusion-Task-Id: FN-4424
Fusion-Task-Lineage: 0a3120bf-9f09-45de-bda7-a59c5842b2d9
This commit is contained in:
Fusion
2026-05-13 20:47:08 -07:00
committed by gsxdsm
parent 8ff216c822
commit fa81832dd2
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__/merger-empty-cherry-pick.test.ts
View File

@@ -159,7 +159,7 @@ describeIfGit("FN-4424 empty cherry-pick handling (real git)", () => {
expect((store.moveTask as ReturnType<typeof vi.fn>).mock.calls.some(([, column]) => column === "done")).toBe(true);
const newShas = git(repo, `git rev-list --reverse ${xSha}..HEAD`).split("\n").filter(Boolean);
expect(newShas).toHaveLength(1);
expect(git(repo, "cat-file -e HEAD:unique.txt && echo present")).toBe("present");
expect(git(repo, "git cat-file -e HEAD:unique.txt && echo present")).toBe("present");
expect((store.logEntry as ReturnType<typeof vi.fn>).mock.calls.some(([id, msg]) => id === task.id
&& String(msg).includes("Auto-merge skipped 1 empty cherry-pick(s); proceeded with 1 non-empty commit(s)"))).toBe(true);
}, 20_000);