Files
fusion/packages/dashboard/app/components/__tests__/TaskDetailModal.create-pr.test.tsx
gsxdsm d23c5d901f FN-6247: refresh PR controls from live auto-merge setting
Keep task detail PR and review affordances synchronized with the current project auto-merge setting.

- Thread the live auto-merge value into task detail modals and list split-pane detail views.
- Prefer the live auto-merge setting over the stale fetched modal snapshot while preserving task-level overrides.
- Cover PR and review tab behavior for auto-merge on/off and document the dashboard behavior.
- Evict flaky engine gate entries and add a patch changeset for the published CLI package.

Files changed:
 .changeset/fn-6247-automerge-off-modal-stale.md    |   5 +
 docs/dashboard-guide.md                            |   1 +
 packages/dashboard/app/App.tsx                     |   3 +-
 packages/dashboard/app/components/AppModals.tsx    |   2 +
 packages/dashboard/app/components/ListView.tsx     |   3 +
 .../dashboard/app/components/TaskDetailModal.tsx   |   4 +-
 .../__tests__/TaskDetailModal.create-pr.test.tsx   | 171 ++++++++++++++++++++-
 packages/engine/vitest.config.ts                   |   2 -
 8 files changed, 182 insertions(+), 9 deletions(-)

Fusion-Task-Id: FN-6247

Fusion-Task-Lineage: 1321c03a-216d-4b15-bf4f-95621d68c9ae
2026-06-11 22:11:44 -07:00

399 lines
14 KiB
TypeScript

import { render, screen, fireEvent, waitFor } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import type { PrInfo } from "@fusion/core";
const prPanelState = vi.hoisted(() => ({
latestPrInfo: undefined as PrInfo | undefined,
latestAutoMerge: undefined as boolean | undefined,
latestIsManualPrFlow: undefined as boolean | undefined,
}));
const prCreateModalState = vi.hoisted(() => ({
latestProps: null as any,
}));
const taskReviewTabState = vi.hoisted(() => ({
latestProps: null as any,
}));
vi.mock("../PrPanel", () => ({
PrPanel: (props: any) => {
prPanelState.latestPrInfo = props.prInfo;
prPanelState.latestAutoMerge = props.autoMerge;
prPanelState.latestIsManualPrFlow = props.isManualPrFlow;
return (
<div>
{props.autoMerge ? (
<div>Auto-merge will handle this task automatically.</div>
) : (
<button type="button" onClick={() => props.onRequestCreatePr?.()}>
Create PR
</button>
)}
<div data-testid="pr-panel-pr-number">{props.prInfo?.number ?? "none"}</div>
</div>
);
},
}));
vi.mock("../PrCreateModal", () => ({
PrCreateModal: (props: any) => {
prCreateModalState.latestProps = props;
if (!props.open) {
return null;
}
return (
<div data-testid="pr-create-modal-stub">
<button
type="button"
onClick={() =>
props.onCreated({
number: 321,
title: "Created PR",
url: "https://example.test/pr/321",
status: "open",
headBranch: "fusion/FN-5020",
baseBranch: "main",
commentCount: 0,
} satisfies PrInfo)
}
>
Stub create
</button>
<button type="button" onClick={() => props.onClose()}>
Stub close
</button>
</div>
);
},
}));
vi.mock("../TaskReviewTab", () => ({
TaskReviewTab: (props: any) => {
taskReviewTabState.latestProps = props;
const effectiveAutoMerge = props.task.autoMerge ?? props.autoMergeEnabled;
const showCreatePr =
props.task.column === "in-review" &&
!props.task.prInfo &&
props.prAuthAvailable === true &&
!effectiveAutoMerge &&
typeof props.onRequestCreatePr === "function";
return showCreatePr ? (
<button type="button" data-testid="task-review-create-pr" onClick={() => props.onRequestCreatePr?.()}>
Review create PR
</button>
) : null;
},
}));
import {
makeTask,
noop,
noopDelete,
noopMerge,
noopMove,
noopOpenDetail,
setupTaskDetailModalHooks,
} from "./TaskDetailModal.test-helpers";
import { fetchSettings } from "../../api";
import { TaskDetailModal } from "../TaskDetailModal";
setupTaskDetailModalHooks();
describe("TaskDetailModal create-PR wiring", () => {
beforeEach(() => {
vi.clearAllMocks();
prPanelState.latestPrInfo = undefined;
prPanelState.latestAutoMerge = undefined;
prPanelState.latestIsManualPrFlow = undefined;
prCreateModalState.latestProps = null;
taskReviewTabState.latestProps = null;
});
it("opens PrCreateModal from PrPanel and updates prInfo on create", async () => {
const addToast = vi.fn();
const onTaskUpdated = vi.fn();
const task = makeTask({ id: "FN-5020", prInfo: undefined, column: "in-review" });
render(
<TaskDetailModal
task={task}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={addToast}
onTaskUpdated={onTaskUpdated}
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => {
expect(screen.getByRole("button", { name: "Create PR" })).toBeInTheDocument();
});
expect(screen.queryByTestId("pr-create-modal-stub")).toBeNull();
fireEvent.click(screen.getByRole("button", { name: "Create PR" }));
expect(screen.getByTestId("pr-create-modal-stub")).toBeInTheDocument();
expect(prCreateModalState.latestProps?.open).toBe(true);
expect(prCreateModalState.latestProps?.taskId).toBe("FN-5020");
expect(prCreateModalState.latestProps?.projectId).toBe("project-123");
expect(prCreateModalState.latestProps?.defaultBaseBranch).toBeUndefined();
expect(prCreateModalState.latestProps?.addToast).toBe(addToast);
fireEvent.click(screen.getByRole("button", { name: "Stub create" }));
expect(screen.queryByTestId("pr-create-modal-stub")).toBeNull();
expect(prCreateModalState.latestProps?.open).toBe(false);
expect(screen.getByTestId("pr-panel-pr-number")).toHaveTextContent("321");
expect(prPanelState.latestPrInfo?.number).toBe(321);
expect(onTaskUpdated).toHaveBeenCalledWith(expect.objectContaining({
id: "FN-5020",
prInfo: expect.objectContaining({ number: 321 }),
}));
});
it("passes effective auto-merge on to PrPanel for per-task override-on with project default off", async () => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: false,
});
render(
<TaskDetailModal
task={makeTask({ id: "FN-5953-A", prInfo: undefined, column: "in-review", autoMerge: true })}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => expect(prPanelState.latestAutoMerge).toBe(true));
});
it("passes effective auto-merge off to PrPanel for per-task override-off with project default on", async () => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: true,
});
render(
<TaskDetailModal
task={makeTask({ id: "FN-5953-B", prInfo: undefined, column: "in-review", autoMerge: false })}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => expect(prPanelState.latestAutoMerge).toBe(false));
});
it("opens the same PrCreateModal from TaskReviewTab without leaving the Review tab and closes via onClose", async () => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: false,
});
const task = makeTask({ id: "FN-5021", prInfo: undefined, column: "in-review" });
render(
<TaskDetailModal
task={task}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
prAuthAvailable
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Review" }));
await waitFor(() => expect(screen.getByTestId("task-review-create-pr")).toBeInTheDocument());
expect(screen.queryByTestId("pr-create-modal-stub")).toBeNull();
fireEvent.click(screen.getByTestId("task-review-create-pr"));
expect(await screen.findByTestId("pr-create-modal-stub")).toBeInTheDocument();
expect(prCreateModalState.latestProps?.open).toBe(true);
expect(prCreateModalState.latestProps?.taskId).toBe("FN-5021");
expect(prCreateModalState.latestProps?.projectId).toBe("project-123");
expect(prCreateModalState.latestProps?.defaultBaseBranch).toBeUndefined();
expect(taskReviewTabState.latestProps?.prAuthAvailable).toBe(true);
expect(taskReviewTabState.latestProps?.autoMergeEnabled).toBe(false);
expect(screen.getByTestId("task-review-create-pr")).toBeInTheDocument();
fireEvent.click(screen.getByRole("button", { name: "Stub close" }));
expect(screen.queryByTestId("pr-create-modal-stub")).toBeNull();
expect(prCreateModalState.latestProps?.open).toBe(false);
});
it("prefers live auto-merge off over a stale fetched snapshot for PR surfaces", async () => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: true,
});
render(
<TaskDetailModal
task={makeTask({ id: "FN-6247-OFF", prInfo: undefined, column: "in-review", autoMerge: undefined })}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
prAuthAvailable
autoMergeEnabled={false}
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => expect(prPanelState.latestAutoMerge).toBe(false));
expect(screen.getByRole("button", { name: "Create PR" })).toBeInTheDocument();
expect(screen.queryByText("Auto-merge will handle this task automatically.")).toBeNull();
fireEvent.click(screen.getByRole("button", { name: "Review" }));
await waitFor(() => expect(taskReviewTabState.latestProps?.autoMergeEnabled).toBe(false));
expect(screen.getByTestId("task-review-create-pr")).toBeInTheDocument();
});
it("prefers live auto-merge on over a stale fetched snapshot for PR surfaces", async () => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: false,
});
render(
<TaskDetailModal
task={makeTask({ id: "FN-6247-ON", prInfo: undefined, column: "in-review", autoMerge: undefined })}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
prAuthAvailable
autoMergeEnabled
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => expect(prPanelState.latestAutoMerge).toBe(true));
expect(screen.getByText("Auto-merge will handle this task automatically.")).toBeInTheDocument();
expect(screen.queryByRole("button", { name: "Create PR" })).toBeNull();
fireEvent.click(screen.getByRole("button", { name: "Review" }));
await waitFor(() => expect(taskReviewTabState.latestProps?.autoMergeEnabled).toBe(true));
expect(screen.queryByTestId("task-review-create-pr")).toBeNull();
});
it.each([
{ taskAutoMerge: undefined, liveAutoMerge: false, expectedEffective: false },
{ taskAutoMerge: undefined, liveAutoMerge: true, expectedEffective: true },
{ taskAutoMerge: true, liveAutoMerge: false, expectedEffective: true },
{ taskAutoMerge: true, liveAutoMerge: true, expectedEffective: true },
{ taskAutoMerge: false, liveAutoMerge: false, expectedEffective: false },
{ taskAutoMerge: false, liveAutoMerge: true, expectedEffective: false },
])(
"resolves effective auto-merge for task override $taskAutoMerge with live global $liveAutoMerge",
async ({ taskAutoMerge, liveAutoMerge, expectedEffective }) => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: !liveAutoMerge,
});
render(
<TaskDetailModal
task={makeTask({ id: `FN-6247-${String(taskAutoMerge)}-${String(liveAutoMerge)}`, prInfo: undefined, column: "in-review", autoMerge: taskAutoMerge })}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
prAuthAvailable
autoMergeEnabled={liveAutoMerge}
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => expect(prPanelState.latestAutoMerge).toBe(expectedEffective));
if (expectedEffective) {
expect(screen.getByText("Auto-merge will handle this task automatically.")).toBeInTheDocument();
} else {
expect(screen.queryByText("Auto-merge will handle this task automatically.")).toBeNull();
expect(screen.getByRole("button", { name: "Create PR" })).toBeInTheDocument();
}
fireEvent.click(screen.getByRole("button", { name: "Review" }));
await waitFor(() => expect(taskReviewTabState.latestProps?.autoMergeEnabled).toBe(liveAutoMerge));
if (expectedEffective) {
expect(screen.queryByTestId("task-review-create-pr")).toBeNull();
} else {
expect(screen.getByTestId("task-review-create-pr")).toBeInTheDocument();
}
},
);
it("keeps manual PR flow driven by live global auto-merge rather than effective override", async () => {
(fetchSettings as ReturnType<typeof vi.fn>).mockResolvedValue({
modelPresets: [],
autoSelectModelPreset: false,
defaultPresetBySize: {},
autoMerge: true,
mergeStrategy: "pull-request",
});
render(
<TaskDetailModal
task={makeTask({ id: "FN-6247-MANUAL", prInfo: undefined, column: "in-review", autoMerge: true })}
projectId="project-123"
onClose={noop}
onMoveTask={noopMove}
onDeleteTask={noopDelete}
onMergeTask={noopMerge}
onOpenDetail={noopOpenDetail}
addToast={vi.fn()}
prAuthAvailable
autoMergeEnabled={false}
/>,
);
fireEvent.click(screen.getByRole("button", { name: "Pull Request" }));
await waitFor(() => expect(prPanelState.latestAutoMerge).toBe(true));
expect(prPanelState.latestIsManualPrFlow).toBe(true);
expect(screen.getByText("Auto-merge will handle this task automatically.")).toBeInTheDocument();
});
});