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

feat(FN-5099): complete Step 4 — pass verification gates

Browse Source 
Fusion-Task-Id: FN-5099
Fusion-Task-Lineage: 26353f25-da61-4b61-8fd2-69915a984cc4
This commit is contained in:
Fusion (runfusion.ai)
2026-05-18 22:33:24 -07:00
committed by gsxdsm
parent 39fee83654
commit d8a04ff5a7
5 changed files with 135 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/engine/src/__tests__/branch-conflicts-foreign-only.test.ts
View File

@@ -66,7 +66,7 @@ describe("classifyForeignOnlyContamination", () => {
expect(result.uniqueShas).toEqual([foreignSha]);
});
it("returns foreign-only-already-upstream when foreign-attributed commits are on main", async () => {
it("returns clean when foreign-attributed commits are already on main", async () => {
const { repoDir, baseSha } = await setupRepo();
const foreignSha = await makeCommit(repoDir, "foreign-b", "feat(FN-4002): foreign upstream", "FN-4002");
await run("git checkout main", repoDir);
@@ -81,10 +81,8 @@ describe("classifyForeignOnlyContamination", () => {
mainRef: "main",
});
expect(result.kind).toBe("foreign-only-already-upstream");
expect(result.foreignCommitCount).toBe(1);
expect(result.uniqueShas).toEqual([]);
expect(result.alreadyUpstreamShas).toEqual([foreignSha]);
expect(result.kind).toBe("clean");
expect(result.foreignCommitCount).toBe(0);
});
it("returns ambiguous when own and foreign commits are mixed", async () => {