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

fix(FN-4409): add merge-base fallback for contamination audit

Browse Source 
Fusion-Task-Id: FN-4409
Fusion-Task-Lineage: c608c942-fec7-4489-9970-b8dc314f8be2
This commit is contained in:
Fusion
2026-05-13 17:24:44 -07:00
committed by gsxdsm
parent 0c0704933f
commit 9f26f83b04
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/__tests__/audit-branch-cross-contamination.test.mjs
View File

@@ -21,8 +21,6 @@ test("flags branch as tainted when foreign task commits are present", () => {
fs.writeFileSync(path.join(dir, "README.md"), "base\n");
run(dir, "git", ["add", "README.md"]);
run(dir, "git", ["commit", "-m", "chore: base"]);
const base = run(dir, "git", ["rev-parse", "HEAD"]);
run(dir, "git", ["checkout", "-b", "fusion/fn-0001"]);
fs.writeFileSync(path.join(dir, "feature.txt"), "foreign\n");
run(dir, "git", ["add", "feature.txt"]);
@@ -32,7 +30,7 @@ test("flags branch as tainted when foreign task commits are present", () => {
fs.mkdirSync(fusionDir, { recursive: true });
const dbPath = path.join(fusionDir, "fusion.db");
run(dir, "sqlite3", [dbPath, `CREATE TABLE tasks (id TEXT PRIMARY KEY, title TEXT, branch TEXT, baseCommitSha TEXT, "column" TEXT);`]);
run(dir, "sqlite3", [dbPath, `INSERT INTO tasks (id, title, branch, baseCommitSha, "column") VALUES ('FN-0001', 'Task 1', 'fusion/fn-0001', '${base}', 'in-progress');`]);
run(dir, "sqlite3", [dbPath, `INSERT INTO tasks (id, title, branch, baseCommitSha, "column") VALUES ('FN-0001', 'Task 1', 'fusion/fn-0001', NULL, 'in-progress');`]);
const report = auditBranchCrossContamination({ projectRoot: dir });
assert.equal(report.taintedTaskCount, 1);
@@ -40,6 +38,7 @@ test("flags branch as tainted when foreign task commits are present", () => {
assert.ok(task);
assert.equal(task.tainted, true);
assert.equal(task.recommendation, "force-reset");
assert.equal(task.baseResolutionSource.startsWith("merge-base("), true);
assert.equal(task.taintedCommits[0].foreignTaskId, "FN-0002");
} finally {
fs.rmSync(dir, { recursive: true, force: true });