Files
fusion/packages/dashboard/app/components/__tests__/TaskDetailModal.create-pr.test.tsx
gsxdsm 645f3c22fe FN-5953: hide manual PR actions when effective auto-merge is on
Honor per-task auto-merge overrides when deciding whether to offer manual PR creation.

- resolve effective auto-merge state before showing Create PR actions on task cards and review views
- pass effective auto-merge through the task detail modal into the PR panel
- expand dashboard tests to cover project-default and per-task auto-merge combinations for PR affordances

Files changed:
 packages/dashboard/app/components/TaskCard.tsx     |  6 ++-
 .../dashboard/app/components/TaskDetailModal.tsx   |  4 +-
 .../dashboard/app/components/TaskReviewTab.tsx     |  2 +-
 .../app/components/__tests__/PrPanel.test.tsx      | 41 +++++++++++++--
 .../app/components/__tests__/TaskCard.test.tsx     | 56 ++++++++++++++------
 .../__tests__/TaskDetailModal.create-pr.test.tsx   | 60 ++++++++++++++++++++++
 .../components/__tests__/TaskReviewTab.test.tsx    | 57 ++++++++++++++++----
 7 files changed, 189 insertions(+), 37 deletions(-)

Fusion-Task-Id: FN-5953

Fusion-Task-Lineage: ffa67b87-922a-47ca-8523-1c62e8e6c48b
2026-06-07 18:51:46 -07:00

238 lines
7.7 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,
}));
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;
return (
<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;
return (
<button type="button" data-testid="task-review-create-pr" onClick={() => props.onRequestCreatePr?.()}>
Review create PR
</button>
);
},
}));
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;
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);
});
});