Open History to see the last commit
1import {
2 EnvironmentId,
3 ProjectId,
4 SourceControlProviderKind,
5 ThreadId,
6 type PullRequestCheck,
7 type ScopedThreadRef,
8} from "@t3tools/contracts";
9import { DraftId } from "~/composerDraftStore";
10import { AsyncResult } from "effect/reactivity";
11import { expect, it, vi } from "vite-plus/test";
12
13const state = vi.hoisted(() => ({
14 status: "success" as PullRequestCheck["status"],
15 extraStatus: null as PullRequestCheck["status"] | null,
16 mergeMethods: ["merge"] as Array<"merge" | "squash" | "rebase">,
17 perform: vi.fn(),
18 newThread: vi.fn(),
19 prepareThread: vi.fn(),
20 checkoutError: null as Error | null,
21 addToast: vi.fn(),
22 updateToast: vi.fn(),
23 projects: [] as unknown[],
24 pullRequests: [] as unknown[],
25 projectMergeMethods: {} as Record<string, "merge" | "squash" | "rebase">,
26}));
27
28vi.mock(import("~/state/entities"), async (importOriginal) => ({
29 ...(await importOriginal()),
30 // Rows render a pull request only with a project, so this does not reach tests that pass none.
31 useServerConfigs: (() =>
32 new Map([
33 [
34 EnvironmentId.make("environment"),
35 { environment: { capabilities: { pullRequests: true } } },
36 ],
37 ])) as never,
38 useProjects: (() => state.projects) as never,
39 useQuietThreadShell: ((ref: unknown) =>
40 ref === null ? null : { branch: null, pullRequests: state.pullRequests }) as never,
41}));
42const queryData = () => ({
43 projectId: ProjectId.make("project"),
44 workspaceRoot: "/workspace",
45 url: "https://github.com/owner/repo/pull/1",
46 number: 1,
47 title: "Test PR",
48 state: "open",
49 isDraft: false,
50 mergeability: "mergeable",
51 headBranch: "feature",
52 baseBranch: "main",
53 changedFiles: 1,
54 additions: 1,
55 deletions: 0,
56 checks: [state.status, ...(state.extraStatus ? [state.extraStatus] : [])].map((status) => ({
57 name: `CI-${status}`,
58 status,
59 description: null,
60 url: null,
61 })),
62 capabilities: { actions: ["merge"], mergeMethods: state.mergeMethods },
63 viewerPermissions: { actions: ["merge"] },
64 mergeCapabilities: {
65 merge: state.mergeMethods.includes("merge"),
66 squash: state.mergeMethods.includes("squash"),
67 rebase: state.mergeMethods.includes("rebase"),
68 },
69});
70vi.mock(import("~/state/query"), async (importOriginal) => ({
71 ...(await importOriginal()),
72 useEnvironmentQuerySelector: ((_atom: unknown, select: (result: unknown) => unknown) =>
73 select(AsyncResult.success(queryData()))) as never,
74 useEnvironmentQueryIsNewer: () => true,
75 useEnvironmentQueryRefresh: () => ({ refresh: vi.fn(), isPending: () => false }),
76 useEnvironmentQuery: (() => ({
77 data: {
78 code: { additions: 1, deletions: 0 },
79 tests: { additions: 0, deletions: 0 },
80 mocks: { additions: 0, deletions: 0 },
81 generated: { additions: 0, deletions: 0 },
82 docs: { additions: 7, deletions: 3 },
83 },
84 isPending: false,
85 })) as never,
86}));
87vi.mock(import("../pullRequest/usePullRequestActions"), async (importOriginal) => ({
88 ...(await importOriginal()),
89 usePullRequestActionRunner: () => ({ actionPending: false, perform: state.perform }),
90 usePullRequestDefaultMergeMethodResolver: ((_environmentId: unknown, projectId: unknown) => () =>
91 state.projectMergeMethods[String(projectId)]) as never,
92}));
93
94vi.mock(import("~/hooks/useHandleNewThread"), async (original) => ({
95 ...(await original()),
96 useNewThreadHandler: (() => state.newThread) as never,
97}));
98vi.mock(import("~/state/sourceControlActions"), async (original) => ({
99 ...(await original()),
100 usePreparePullRequestThreadAction: (() => ({
101 run: state.prepareThread,
102 isAllowed: true,
103 error: state.checkoutError,
104 })) as never,
105}));
106vi.mock(import("../ui/toast"), async (original) => {
107 const actual = await original();
108 return {
109 ...actual,
110 toastManager: {
111 ...actual.toastManager,
112 add: state.addToast,
113 update: state.updateToast,
114 } as never,
115 };
116});
117
118import { act, render as renderUi } from "../../../test/render";
119import { useComposerDraftStore } from "~/composerDraftStore";
120import { useUiStateStore } from "~/uiStateStore";
121import { ThreadDetailsPrRow } from "./ThreadDetailsPrRow";
122import { ThreadDetailsThreadPrRows } from "./ThreadDetailsPrRows";
123
124const threadRef: ScopedThreadRef = {
125 environmentId: EnvironmentId.make("environment"),
126 threadId: ThreadId.make("thread"),
127};
128const scratchProject = {
129 id: ProjectId.make("scratch"),
130 environmentId: EnvironmentId.make("environment"),
131 title: "No project",
132 workspaceRoot: "/home/user/.t3/scratch",
133 scripts: [],
134};
135const repositoryProject = {
136 id: ProjectId.make("repository"),
137 environmentId: EnvironmentId.make("environment"),
138 title: "repo",
139 workspaceRoot: "/work/repo",
140 scripts: [],
141 repositoryIdentity: {
142 canonicalKey: "github.com/owner/repo",
143 locator: {
144 source: "git-remote",
145 remoteName: "origin",
146 remoteUrl: "https://github.com/owner/repo.git",
147 },
148 provider: SourceControlProviderKind.make("github"),
149 owner: "owner",
150 name: "repo",
151 displayName: "owner/repo",
152 },
153};
154
155const clickButton = async (scope: ParentNode, label: string) =>
156 await act(async () => {
157 [...scope.querySelectorAll("button")]
158 .find((button) => button.textContent?.trim() === label)!
159 .click();
160 });
161
162it("merges with the last selected merge method", async () => {
163 await using screen = await setup();
164 const { container } = screen;
165 state.mergeMethods = ["merge", "squash"];
166 useUiStateStore.getState().setPullRequestMergeMethod("squash");
167 await act(async () => {
168 await screen.rerender(
169 <ThreadDetailsPrRow
170 environmentId={EnvironmentId.make("environment")}
171 pr={null}
172 number={1}
173 status={null}
174 project={null}
175 label="Test PR"
176 openAriaLabel="Open PR"
177 onOpen={vi.fn()}
178 />,
179 );
180 });
181 const clickMerge = async (scope: ParentNode) =>
182 await act(async () => {
183 [...scope.querySelectorAll("button")]
184 .find((button) => button.textContent?.trim() === "Merge")!
185 .click();
186 });
187 await clickMerge(container);
188 const dialog = document.querySelector('[role="alertdialog"]')!;
189 expect(dialog.textContent).toContain("using squash");
190 await clickMerge(dialog);
191 expect(state.perform).toHaveBeenCalledWith("merge", "squash");
192});
193
194it("requires a new merge click after passing checks become pending and pass again", async () => {
195 await using screen = await setup();
196 const { container } = screen;
197 const render = () => (
198 <ThreadDetailsPrRow
199 environmentId={EnvironmentId.make("environment")}
200 pr={null}
201 number={1}
202 status={null}
203 project={null}
204 label="Test PR"
205 openAriaLabel="Open PR"
206 onOpen={vi.fn()}
207 />
208 );
209 const clickMerge = async () =>
210 await act(async () => {
211 [...container.querySelectorAll("button")]
212 .find((button) => button.textContent?.trim() === "Merge")!
213 .click();
214 });
215 const dialogs = () => [...document.querySelectorAll('[role="alertdialog"]')];
216
217 await act(async () => await screen.rerender(render()));
218 await clickMerge();
219 expect(dialogs()).toHaveLength(1);
220 await act(async () => {
221 state.status = "pending";
222 await screen.rerender(render());
223 });
224 expect(dialogs()).toHaveLength(0);
225 await act(async () => {
226 state.status = "success";
227 await screen.rerender(render());
228 });
229 expect(dialogs()).toHaveLength(0);
230 await clickMerge();
231 expect(dialogs()).toHaveLength(1);
232 expect(state.perform).not.toHaveBeenCalled();
233});
234
235async function setup() {
236 state.perform.mockReset();
237 state.checkoutError = null;
238 state.newThread.mockReset().mockResolvedValue({
239 draftId: DraftId.make("new-draft"),
240 threadId: ThreadId.make("new-thread"),
241 });
242 state.prepareThread.mockReset();
243 state.addToast.mockReset().mockReturnValue("checkout-toast");
244 state.updateToast.mockReset();
245
246 state.status = "success";
247 state.extraStatus = null;
248 state.mergeMethods = ["merge"];
249 state.projects = [];
250 state.pullRequests = [];
251 state.projectMergeMethods = {};
252 useComposerDraftStore.getState().clearComposerContent(threadRef);
253 useUiStateStore.getState().setPullRequestMergeMethod("merge");
254 return renderUi(null);
255}
256
257it("adds the failing checks to a given composer instead of opening a new thread", async () => {
258 await using screen = await setup();
259 state.status = "failure";
260 await act(async () => {
261 await screen.rerender(
262 <ThreadDetailsPrRow
263 environmentId={EnvironmentId.make("environment")}
264 pr={null}
265 number={1}
266 status={null}
267 project={null}
268 label="Test PR"
269 openAriaLabel="Open PR"
270 onOpen={vi.fn()}
271 composerTarget={threadRef}
272 />,
273 );
274 });
275 await clickButton(screen.container, "Fix");
276 expect(state.newThread).not.toHaveBeenCalled();
277 expect(state.prepareThread).not.toHaveBeenCalled();
278 expect(useComposerDraftStore.getState().getComposerDraft(threadRef)?.prompt).toContain(
279 "https://github.com/owner/repo/pull/1",
280 );
281});
282
283const repositoryClone = {
284 ...repositoryProject,
285 id: ProjectId.make("clone"),
286 workspaceRoot: "/work/clone",
287};
288
289it.each([
290 {
291 name: "the project holding its repository, not the No project thread's",
292 thread: scratchProject,
293 repository: "owner/repo",
294 expected: "rebase",
295 },
296 {
297 name: "the thread's own project when it holds the repository too",
298 thread: repositoryClone,
299 repository: "owner/repo",
300 expected: "merge",
301 },
302 {
303 name: "the thread's project when no project holds the repository",
304 thread: scratchProject,
305 repository: "owner/other",
306 expected: "squash",
307 },
308])("merges a linked pull request with $name", async ({ thread, repository, expected }) => {
309 await using screen = await setup();
310 state.mergeMethods = ["merge", "squash", "rebase"];
311 state.projects = [scratchProject, repositoryProject, repositoryClone];
312 state.projectMergeMethods = { scratch: "squash", repository: "rebase", clone: "merge" };
313 useUiStateStore.getState().setPullRequestMergeMethod("squash");
314 state.pullRequests = [
315 {
316 host: "github.com",
317 repository,
318 number: 1,
319 url: `https://github.com/${repository}/pull/1`,
320 source: "manual",
321 linkedAt: "2026-10-30T00:00:00.000Z",
322 snapshot: null,
323 stack: null,
324 },
325 ];
326 await act(async () => {
327 await screen.rerender(
328 <ThreadDetailsThreadPrRows threadRef={threadRef} project={thread as never} />,
329 );
330 });
331 await clickButton(screen.container, "Merge");
332 expect(document.querySelector('[role="alertdialog"]')!.textContent).toContain(
333 `using ${expected}`,
334 );
335});