feat(FN-4550): remove duplicate Case 6 skip coverage
Removes a duplicate "Case 6" skip from the merge-strategy overlap test file, cleaning up the test coverage without changing behavior. Fusion-Task-Id: FN-4550 Fusion-Task-Lineage: 3b254a66-bd47-4699-a788-3a57178a2884
This commit is contained in:
@@ -8,22 +8,7 @@ describeIfGit("reliability interactions: merge strategy + overlap", () => {
|
|||||||
const fixtures: Array<Awaited<ReturnType<typeof makeReliabilityFixture>>> = [];
|
const fixtures: Array<Awaited<ReturnType<typeof makeReliabilityFixture>>> = [];
|
||||||
afterEach(async () => { while (fixtures.length) await fixtures.pop()!.cleanup(); });
|
afterEach(async () => { while (fixtures.length) await fixtures.pop()!.cleanup(); });
|
||||||
|
|
||||||
it.skip("Case 6: auto strategy keeps multi-commit branch history", async () => {
|
// Case 6 (auto-strategy multi-commit history) is covered by src/__tests__/merger-commit-strategy.real-git.test.ts: auto-routes multi-substantive branches to history-preserving direct merge.
|
||||||
const fx = await makeReliabilityFixture({ taskId: "FN-4361-C6", settings: { directMergeCommitStrategy: "auto" } });
|
|
||||||
fixtures.push(fx);
|
|
||||||
await fx.createBranch("fusion/fn-4361-c6");
|
|
||||||
await fx.writeAndCommit("src/a.txt", "1\n", "fix: one");
|
|
||||||
await fx.writeAndCommit("src/b.txt", "2\n", "fix: two");
|
|
||||||
await fx.writeAndCommit("src/c.txt", "3\n", "fix: three");
|
|
||||||
await fx.checkout("main");
|
|
||||||
await fx.store.updateTask(fx.task.id, { branch: "fusion/fn-4361-c6", column: "in-review", steps: [{ name: "impl", status: "done" }] } as any);
|
|
||||||
|
|
||||||
await fx.mergeTask();
|
|
||||||
const subjects = git(fx.rootDir, "git log --format=%s -n 3");
|
|
||||||
expect(subjects).toContain("fix: one");
|
|
||||||
expect(subjects).toContain("fix: two");
|
|
||||||
expect(subjects).toContain("fix: three");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("Case 7: diff-volume gate detects dropped branch contribution", async () => {
|
it("Case 7: diff-volume gate detects dropped branch contribution", async () => {
|
||||||
const fx = await makeReliabilityFixture({ taskId: "FN-4361-C7" });
|
const fx = await makeReliabilityFixture({ taskId: "FN-4361-C7" });
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import test from "node:test";
|
import test from "node:test";
|
||||||
import assert from "node:assert/strict";
|
import assert from "node:assert/strict";
|
||||||
|
import { mkdtempSync, rmSync } from "node:fs";
|
||||||
|
import os from "node:os";
|
||||||
|
import path from "node:path";
|
||||||
import { tsImport } from "tsx/esm/api";
|
import { tsImport } from "tsx/esm/api";
|
||||||
import { composeTransitionEvidence } from "../backfill-fn-4441-transition-evidence.mjs";
|
import { composeTransitionEvidence } from "../backfill-fn-4441-transition-evidence.mjs";
|
||||||
|
|
||||||
@@ -48,7 +51,8 @@ test("composeTransitionEvidence includes required evidence fields", () => {
|
|||||||
|
|
||||||
test("TaskStore upsertTaskDocument increments revision and round-trips latest content", async () => {
|
test("TaskStore upsertTaskDocument increments revision and round-trips latest content", async () => {
|
||||||
const TaskStore = await loadTaskStore();
|
const TaskStore = await loadTaskStore();
|
||||||
const store = new TaskStore(process.cwd(), undefined, { inMemoryDb: true });
|
const projectRoot = mkdtempSync(path.join(os.tmpdir(), "fn-4441-transition-evidence-"));
|
||||||
|
const store = new TaskStore(projectRoot, undefined, { inMemoryDb: true });
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await store.createTaskWithReservedId({ description: "seed" }, { taskId: "FN-4441" });
|
await store.createTaskWithReservedId({ description: "seed" }, { taskId: "FN-4441" });
|
||||||
@@ -72,5 +76,6 @@ test("TaskStore upsertTaskDocument increments revision and round-trips latest co
|
|||||||
assert.equal(doc?.content, "second");
|
assert.equal(doc?.content, "second");
|
||||||
} finally {
|
} finally {
|
||||||
await store.close();
|
await store.close();
|
||||||
|
rmSync(projectRoot, { recursive: true, force: true });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user