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

feat(FN-4474): merge fusion/fn-4474

Browse Source 
Commits merged:
- merge fusion/fn-4474

Files changed:
packages/core/src/__tests__/db-migrate.test.ts           |  4 ++--
 packages/engine/src/__tests__/branch-autocorrect.test.ts | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

Fusion-Task-Id: FN-4474

Fusion-Task-Lineage: 979782e1-c44d-4f35-aded-237bf33d0c9f
This commit is contained in:
Fusion
2026-05-14 09:08:22 -07:00
committed by gsxdsm
parent 765838cc15
commit f0a736bc01
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/engine/src/__tests__/branch-autocorrect.test.ts
View File

@@ -1,9 +1,12 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import type { ExecException } from "node:child_process";
const { execMock } = vi.hoisted(() => ({
execMock: vi.fn(),
}));
vi.mock("node:child_process", async () => {
const { promisify } = await import("node:util");
const execMock = vi.fn();
const execFn: any = vi.fn((cmd: string, opts: any, cb: any) => {
const callback = typeof opts === "function" ? opts : cb;
@@ -33,7 +36,6 @@ vi.mock("node:child_process", async () => {
});
import { attemptBranchAutocorrect } from "../branch-autocorrect.js";
import { __execMock as execMock } from "node:child_process";
const mockedExec = vi.mocked(execMock);
@@ -72,7 +74,7 @@ describe("attemptBranchAutocorrect", () => {
const result = await attemptBranchAutocorrect({ worktreePath: "/tmp/wt", observedBranch: "lemon-sage", expectedBranch: "fusion/fn-2", rootDir: "/tmp" });
expect(result).toEqual({ status: "renamed" });
expect(mockedExec.mock.calls.map((c) => c[0])).toContain("git branch -m 'lemon-sage' 'fusion/fn-2'");
expect(mockedExec.mock.calls.map((c: unknown[]) => c[0])).toContain("git branch -m 'lemon-sage' 'fusion/fn-2'");
});
it("falls back to checkout -B when branch has upstream", async () => {
@@ -82,7 +84,7 @@ describe("attemptBranchAutocorrect", () => {
const result = await attemptBranchAutocorrect({ worktreePath: "/tmp/wt", observedBranch: "lemon-sage", expectedBranch: "fusion/fn-2", rootDir: "/tmp" });
expect(result).toEqual({ status: "checked-out" });
expect(mockedExec.mock.calls.map((c) => c[0])).toEqual([
expect(mockedExec.mock.calls.map((c: unknown[]) => c[0])).toEqual([
"git rev-parse --abbrev-ref --symbolic-full-name 'lemon-sage'@{u}",
"git checkout -B 'fusion/fn-2'",
]);