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

fix(FN-4383): satisfy tsc signatures in exec mock implementations

Browse Source 
Fusion-Task-Id: FN-4383
Fusion-Task-Lineage: 69516bdf-34d1-405c-8bc9-b558c4780863
This commit is contained in:
Fusion
2026-05-13 15:20:24 -07:00
committed by gsxdsm
parent 86bcd2566b
commit 084047555c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/engine/src/__tests__/executor-base-commit-capture.test.ts
View File

@@ -27,7 +27,10 @@ describe("captureBaseCommitSha", () => {
});
it("captures merge-base for fresh worktree", async () => {
mockedExec.mockImplementation((cmd: any, _opts: any, cb: any) => cb(null, cmd.includes("merge-base") ? "abc1234\n" : ""));
mockedExec.mockImplementation(((cmd: any, _opts: any, cb: any) => {
cb(null, cmd.includes("merge-base") ? "abc1234\n" : "");
return {} as any;
}) as any);
const store = createMockStore();
const executor = new TaskExecutor(store, "/tmp/test");
const audit = { git: vi.fn().mockResolvedValue(undefined) };
@@ -54,7 +57,10 @@ describe("captureBaseCommitSha", () => {
mockedExecSync.mockImplementation(() => {
throw new Error("not ancestor");
});
mockedExec.mockImplementation((cmd: any, _opts: any, cb: any) => cb(null, cmd.includes("merge-base") ? "new456\n" : ""));
mockedExec.mockImplementation(((cmd: any, _opts: any, cb: any) => {
cb(null, cmd.includes("merge-base") ? "new456\n" : "");
return {} as any;
}) as any);
const store = createMockStore();
const executor = new TaskExecutor(store, "/tmp/test");
const audit = { git: vi.fn().mockResolvedValue(undefined) };
@@ -77,13 +83,14 @@ describe("captureBaseCommitSha", () => {
});
it("falls back to HEAD when merge-base fails", async () => {
mockedExec.mockImplementation((cmd: any, _opts: any, cb: any) => {
mockedExec.mockImplementation(((cmd: any, _opts: any, cb: any) => {
if (String(cmd).includes("merge-base")) {
cb(new Error("merge-base failed"), "", "merge-base failed");
return;
return {} as any;
}
cb(null, "head777\n", "");
});
return {} as any;
}) as any);
const store = createMockStore();
const executor = new TaskExecutor(store, "/tmp/test");
const audit = { git: vi.fn().mockResolvedValue(undefined) };

7
packages/engine/src/__tests__/executor-worktree.test.ts
View File

@@ -1904,13 +1904,14 @@ describe("TaskExecutor worktree pool integration", () => {
}
return "" as any;
});
mockedExec.mockImplementation((cmd: any, _opts: any, cb: any) => {
mockedExec.mockImplementation(((cmd: any, _opts: any, cb: any) => {
if (String(cmd).includes("git merge-base HEAD origin/main")) {
cb(null, "newbase123\n", "");
return;
return {} as any;
}
cb(null, "", "");
});
return {} as any;
}) as any);
const store = createMockStore();
store.getTask.mockResolvedValue({