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

test(FN-4648): address regression review gaps

Browse Source 
Fusion-Task-Id: FN-4648
Fusion-Task-Lineage: 82289e69-7e72-40e4-acaf-b98ad82ad354
This commit is contained in:
Fusion
2026-05-15 11:27:40 -07:00
committed by gsxdsm
parent d53110cd04
commit 7bca991375
2 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/engine/src/__tests__/merge-error-recovery.test.ts
View File

@@ -629,6 +629,25 @@ describe("ProjectEngine merge error recovery", () => {
);
});
it("auto-finalizes paused+failed merge-confirmed tasks by clearing soft blockers", async () => {
const store = makeStore({
tasks: [
makeTask({
mergeDetails: { mergeConfirmed: true },
paused: true,
status: "failed",
error: "stale merge failure",
}),
],
});
const engine = createEngine(store);
await runMergeCycle(engine);
expect(store.updateTask).toHaveBeenCalledWith(TASK_ID, { paused: false, status: null, error: null });
expect(store.moveTask).toHaveBeenCalledWith(TASK_ID, "done");
});
it("does not park merge-confirmed tasks as failed when finalize loses in-review ownership", async () => {
const store = makeStore({
tasks: [

51
packages/engine/src/__tests__/self-healing.test.ts
View File

@@ -3868,21 +3868,37 @@ describe("SelfHealingManager", () => {
it("auto-finalizes FN-4611-shape paused+failed tasks when landed content is proven", async () => {
const managerWithRecovery = new SelfHealingManager(store, { rootDir: "/tmp/test-project" });
(store.getSettings as ReturnType<typeof vi.fn>).mockResolvedValue({ globalPause: false, enginePaused: false });
(store.listTasks as ReturnType<typeof vi.fn>).mockResolvedValue([
{
id: "FN-4611-shape",
column: "in-review",
paused: true,
status: "failed",
error: "stale merge failure",
mergeRetries: 3,
mergeDetails: undefined,
baseBranch: "main",
branch: "fusion/fn-4611-shape",
steps: [],
log: [],
},
]);
(store.listTasks as ReturnType<typeof vi.fn>)
.mockResolvedValueOnce([
{
id: "FN-4611-shape",
column: "in-review",
paused: true,
status: "failed",
error: "stale merge failure",
mergeRetries: 3,
mergeDetails: undefined,
baseBranch: "main",
branch: "fusion/fn-4611-shape",
steps: [],
log: [],
},
])
.mockResolvedValue([
{
id: "FN-4611-shape",
column: "done",
dependencies: [],
log: [],
},
{
id: "FN-dependent",
column: "todo",
blockedBy: "FN-4611-shape",
dependencies: [],
log: [],
},
]);
mockedExecSync.mockImplementation((command: string | Buffer) => {
if (String(command).includes("Fusion-Task-Id: FN-4611-shape")) return "abc123\n" as any;
return "tip\n" as any;
@@ -3896,6 +3912,11 @@ describe("SelfHealingManager", () => {
expect.objectContaining({ paused: false, status: null, error: null, mergeRetries: 0 }),
);
expect(store.moveTask).toHaveBeenCalledWith("FN-4611-shape", "done");
expect(store.updateTask).toHaveBeenCalledWith("FN-dependent", {
blockedBy: null,
overlapBlockedBy: null,
status: null,
});
managerWithRecovery.stop();
});