diff --git a/packages/source-control-gitlab/src/shared/definition.test.ts b/packages/source-control-gitlab/src/shared/definition.test.ts index 9cd95fadfafcc..a67cfeda25cd8 100644 --- a/packages/source-control-gitlab/src/shared/definition.test.ts +++ b/packages/source-control-gitlab/src/shared/definition.test.ts @@ -100,6 +100,15 @@ describe("GitLab change request URLs", () => { }); }); +describe("GitLab CLI commands", () => { + it("recognizes shell merges and closes, including glab's `accept` alias", () => { + for (const command of ["glab mr merge 7 --yes", "glab mr accept 7 --yes", "glab mr close 7"]) { + expect(definition.changeRequestCloseCommand.test(command), command).toBe(true); + } + expect(definition.changeRequestCloseCommand.test("glab mr view 7")).toBe(false); + }); +}); + describe("GitLab remotes", () => { const recognize = (url: string) => recognizeRemoteWith(definition, url); diff --git a/packages/source-control-gitlab/src/shared/definition.ts b/packages/source-control-gitlab/src/shared/definition.ts index 2ec891cae34b8..16d5bb8cf0efa 100644 --- a/packages/source-control-gitlab/src/shared/definition.ts +++ b/packages/source-control-gitlab/src/shared/definition.ts @@ -62,7 +62,8 @@ export const definition = defineSourceControl({ "delete-branch", ] as const), checkoutCommand: ({ number }) => `glab mr checkout ${number}`, - changeRequestCloseCommand: /\bglab\s+mr\s+(?:merge|close)\b/u, + // `accept` is glab's alias for `merge`. + changeRequestCloseCommand: /\bglab\s+mr\s+(?:merge|accept|close)\b/u, changeRequestCreateCommand: /\bglab\s+mr\s+create\b/u, // Bot users, unlike GitHub's, have real profile pages. authorProfileUrl: (login, repositoryUrl) =>