jb/paseo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify PR merge action labels (#1608)

Browse Source 
* fix: disambiguate merge PR action labels (squash/merge/rebase)

* Clarify PR merge method labels

* Address merge label review feedback

---------

Co-authored-by: Matt Cowger <matt@cowger.us>
This commit is contained in:
Mohamed Boudra
2026-06-19 12:04:52 +08:00
committed by GitHub
co-authored by Matt Cowger
parent e73b1c4724
commit f9660c7e89
7 changed files with 88 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/git/policy.test.ts
+48 -10
View File
@@ -377,7 +377,7 @@ describe("git-actions-policy", () => {
expect(actions.primary).toMatchObject({
id: "merge-pr-squash",
label: "Merge",
label: "Merge PR (squash)",
});
});
@@ -398,7 +398,7 @@ describe("git-actions-policy", () => {
expect(actions.primary).toMatchObject({
id: "merge-pr-squash",
label: "Merge",
label: "Merge PR (squash)",
});
});
@@ -458,7 +458,7 @@ describe("git-actions-policy", () => {
expect(actions.primary).toMatchObject({
id: "merge-pr-squash",
label: "Merge",
label: "Merge PR (squash)",
});
});
@@ -512,7 +512,7 @@ describe("git-actions-policy", () => {
expect(actions.primary).toMatchObject({
id: "merge-pr-squash",
label: "Merge",
label: "Merge PR (squash)",
});
expect(actions.secondary.some((action) => action.id === "merge-branch")).toBe(true);
});
@@ -583,7 +583,7 @@ describe("git-actions-policy", () => {
},
{
id: "merge-pr-squash",
label: "Merge",
label: "Merge PR (squash)",
pendingLabel: "Merging PR...",
successLabel: "PR merged",
disabled: false,
@@ -592,7 +592,7 @@ describe("git-actions-policy", () => {
},
{
id: "merge-pr-merge",
label: "Merge",
label: "Merge PR (merge)",
pendingLabel: "Merging PR...",
successLabel: "PR merged",
disabled: false,
@@ -601,7 +601,7 @@ describe("git-actions-policy", () => {
},
{
id: "merge-pr-rebase",
label: "Merge",
label: "Merge PR (rebase)",
pendingLabel: "Merging PR...",
successLabel: "PR merged",
disabled: false,
@@ -703,7 +703,10 @@ describe("git-actions-policy", () => {
);
expect(oldDaemonStatus.github).toBeUndefined();
expect(actions.primary).toMatchObject({ id: "merge-pr-squash", label: "Merge" });
expect(actions.primary).toMatchObject({
id: "merge-pr-squash",
label: "Merge PR (squash)",
});
expect(actions.secondary.map((action) => action.id)).toEqual([
"pull",
"push",
@@ -744,7 +747,7 @@ describe("git-actions-policy", () => {
expect(actions.primary).toMatchObject({
id: "enable-pr-auto-merge-squash",
label: "Auto merge",
label: "Auto merge (squash)",
});
expect(actions.secondary.map((action) => action.id)).toEqual([
"pull",
@@ -762,6 +765,41 @@ describe("git-actions-policy", () => {
).toBe(false);
});
it.each([
["SQUASH", "enable-pr-auto-merge-squash", "Auto merge (squash)"],
["MERGE", "enable-pr-auto-merge-merge", "Auto merge (merge)"],
["REBASE", "enable-pr-auto-merge-rebase", "Auto merge (rebase)"],
] as const)(
"labels the %s auto-merge action with its method",
(viewerDefaultMergeMethod, id, label) => {
const actions = buildGitActions(
createInput({
hasRemote: true,
isOnBaseBranch: false,
aheadCount: 2,
hasPullRequest: true,
pullRequestUrl: "https://example.com/pr/993",
pullRequestState: "open",
pullRequestMergeable: "MERGEABLE",
pullRequestGithub: githubStatus({
mergeStateStatus: "BLOCKED",
viewerCanEnableAutoMerge: true,
repository: {
autoMergeAllowed: true,
mergeCommitAllowed: true,
squashMergeAllowed: true,
rebaseMergeAllowed: true,
viewerDefaultMergeMethod,
},
}),
shipDefault: "pr",
}),
);
expect(actions.primary).toMatchObject({ id, label });
},
);
it("does not offer auto-merge when the daemon feature gate is missing", () => {
const actions = buildGitActions(
createInput({
@@ -851,7 +889,7 @@ describe("git-actions-policy", () => {
expect(actions.primary).toMatchObject({
id: "merge-pr-merge",
label: "Merge",
label: "Merge PR (merge)",
});
expect(actions.secondary.map((action) => action.id)).toEqual([
"pull",