* feat(checkout): merge PR action with real-GitHub e2e test Adds a `checkoutPrMerge` server RPC backed by `gh pr merge` (squash, merge, or rebase) and surfaces three new actions in the git-actions menu — "Squash and merge", "Create a merge commit", "Rebase and merge" — with squash taking the primary slot when a PR is open and mergeable. Also renames the existing local merge action to "Merge locally" to disambiguate it from the new GitHub-side merge. Adds an end-to-end test that creates a real temporary GitHub repo, opens a PR via the daemon, polls until mergeable, calls `checkoutPrMerge`, and verifies the merge landed on `main` — no mocks. The test pre-flights the `delete_repo` scope so it skips cleanly on tokens that can't tear down, and fails loud if cleanup ever errors so we don't leak repos. PR status gains an optional `mergeable` field (`MERGEABLE | CONFLICTING | UNKNOWN`) populated from `gh pr view --json mergeable`. The schema is backward compatible — old payloads without the field still parse and default to `UNKNOWN` via `z.catch`. * Update PR status snapshot expectations * refactor: collect git/checkout/PR feature into packages/app/src/git/ Move 21 git/checkout/PR files out of components/, hooks/, stores/, screens/, utils/ flat-peer slop into a single packages/app/src/git/ module with shrunk filenames (git-diff-pane.tsx -> diff-pane.tsx, use-git-actions.ts -> use-actions.ts, etc). Dedupe: drop the duplicate useGitActionHandlers from diff-pane.tsx — the shared useGitActions hook is the single source. Drop the buildGitActionsForPane wrapper. Collapse the merge-PR triple fan-out (mergePrSquash/Merge/RebaseStatus) into one record keyed by CheckoutPrMergeMethod. Streamline server-side single-use helpers (dispatchStash/PullRequestMessage adapters, GitHubPullRequestMergeError wrapper, legacy worktree test helpers). Schema-additive only: messages.ts exports CheckoutPrMergeMethod and PullRequestMergeable types; daemon-client.ts uses the typed alias. Backward-compatible. Net delta: 43 files, +219/-1212. * fix(app): use GitHub icon for all merge-PR menu actions * test: namespace temp GitHub repos under `paseotmp-` and centralize naming Old prefixes (`paseo-checkout-ship-`, `paseo-e2e-`, `paseo-checkout-pr-merge-`) collided with the `paseo-*` namespace of real repos, making bulk cleanup unsafe. Switch every test that creates real GitHub repos to a single unmistakable `paseotmp-` prefix, owned by one shared helper per test boundary so no caller can name a repo outside the namespace. - New `packages/server/src/server/test-utils/temp-github-repo.ts` exports `TEMP_GITHUB_REPO_PREFIX` + `createTempGithubRepoName(category)`; both server e2e tests (checkout-ship, checkout-pr-merge) consume it. - `packages/app/e2e/helpers/github-fixtures.ts` locks the prefix internally and now requires callers to pass a `category` instead of an arbitrary `prefix`. Updated pr-pane and composer-attachments specs accordingly.
125 lines
4.1 KiB
TypeScript
125 lines
4.1 KiB
TypeScript
import { test } from "./fixtures";
|
|
import {
|
|
openPrPane,
|
|
expectPrPaneTitle,
|
|
expectPrPaneState,
|
|
expectPrPaneCheckSummary,
|
|
expectPrPaneActivityCount,
|
|
} from "./helpers/pr-pane";
|
|
import { gotoWorkspace } from "./helpers/launcher";
|
|
import { hasGithubAuth, createTempGithubRepo, type GhRepoFixture } from "./helpers/github-fixtures";
|
|
import {
|
|
connectWorkspaceSetupClient,
|
|
type WorkspaceSetupDaemonClient,
|
|
} from "./helpers/workspace-setup";
|
|
|
|
const GITHUB_AUTH = hasGithubAuth();
|
|
|
|
test.describe("PR pane", () => {
|
|
test.describe.configure({ retries: 1 });
|
|
|
|
let seedClient: WorkspaceSetupDaemonClient;
|
|
let repoFixture: GhRepoFixture;
|
|
const workspaceByTitle = new Map<string, string>();
|
|
|
|
test.beforeAll(async () => {
|
|
if (!GITHUB_AUTH) return;
|
|
|
|
seedClient = await connectWorkspaceSetupClient();
|
|
|
|
repoFixture = await createTempGithubRepo({
|
|
category: "pr-pane",
|
|
prs: [
|
|
{ title: "Review selected start ref", state: "open" },
|
|
{ title: "Merged feature branch", state: "merged" },
|
|
{ title: "Closed without merge", state: "closed" },
|
|
{ title: "Work in progress", state: "draft" },
|
|
{
|
|
title: "PR with mixed checks",
|
|
state: "open",
|
|
checks: [
|
|
{ context: "build-1", state: "success" },
|
|
{ context: "build-2", state: "success" },
|
|
{ context: "deploy", state: "failure" },
|
|
{ context: "security", state: "pending" },
|
|
],
|
|
},
|
|
{ title: "PR with reviews", state: "open", commentCount: 3 },
|
|
{ title: "PR with no checks", state: "open" },
|
|
],
|
|
});
|
|
|
|
for (const pr of repoFixture.prs) {
|
|
const result = await seedClient.openProject(pr.localPath);
|
|
if (!result.workspace) {
|
|
throw new Error(result.error ?? `Failed to open project ${pr.localPath}`);
|
|
}
|
|
workspaceByTitle.set(pr.title, result.workspace.id);
|
|
}
|
|
});
|
|
|
|
test.afterAll(async () => {
|
|
await repoFixture?.cleanup().catch(() => undefined);
|
|
await seedClient?.close().catch(() => undefined);
|
|
});
|
|
|
|
test.beforeEach(async () => {
|
|
test.skip(!GITHUB_AUTH, "Requires GitHub authentication (gh auth login)");
|
|
test.setTimeout(60_000);
|
|
});
|
|
|
|
test("renders an open PR with title, state, and repo line", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("Review selected start ref")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneTitle(page, "Review selected start ref");
|
|
await expectPrPaneState(page, "open");
|
|
});
|
|
|
|
test("renders merged state label and icon", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("Merged feature branch")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneState(page, "merged");
|
|
await expectPrPaneTitle(page, "Merged feature branch");
|
|
});
|
|
|
|
test("renders closed state label and icon", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("Closed without merge")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneState(page, "closed");
|
|
await expectPrPaneTitle(page, "Closed without merge");
|
|
});
|
|
|
|
test("renders draft state label and icon", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("Work in progress")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneState(page, "draft");
|
|
await expectPrPaneTitle(page, "Work in progress");
|
|
});
|
|
|
|
test("renders check pills with correct passed/failed/pending counts", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("PR with mixed checks")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneCheckSummary(page, { passed: 2, failed: 1, pending: 1 });
|
|
});
|
|
|
|
test("renders activity rows with correct count", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("PR with reviews")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneActivityCount(page, 3);
|
|
});
|
|
|
|
test("renders gracefully with zero checks", async ({ page }) => {
|
|
await gotoWorkspace(page, workspaceByTitle.get("PR with no checks")!);
|
|
await openPrPane(page);
|
|
|
|
await expectPrPaneCheckSummary(page, { passed: 0, failed: 0, pending: 0 });
|
|
await expectPrPaneTitle(page, "PR with no checks");
|
|
});
|
|
});
|