fix(manage-merge-queue): broken github profile link in comment (#695)

ExpediaGroup · Jan 16, 2025 · 635aee6 · 635aee6
1 parent 2ec4f0a
commit 635aee6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/dist/284.index.js b/dist/284.index.js
diff --git a/dist/284.index.js.map b/dist/284.index.js.map
diff --git a/src/helpers/manage-merge-queue.ts b/src/helpers/manage-merge-queue.ts
@@ -33,7 +33,6 @@ import { approvalsSatisfied } from './approvals-satisfied';
 import { createPrComment } from './create-pr-comment';
 import { isUserInTeam } from './is-user-in-team';
 import { getEmailOnUserProfile } from './get-email-on-user-profile';
-import { join } from 'path';
 
 export class ManageMergeQueue extends HelperInputs {
   max_queue_size?: string;
@@ -68,9 +67,9 @@ export const manageMergeQueue = async ({
   if (slack_webhook_url && login) {
     const email = await getEmailOnUserProfile({ login, pattern });
     if (!email) {
-      const patternText = pattern ? ` and must match the regex pattern \`${pattern}\`` : '';
+      const patternText = pattern ? `, and it must match the regex pattern \`${pattern}\`` : '';
       await createPrComment({
-        body: `@${login} Your PR cannot be added to the queue because your email must be set on your [GitHub profile](${join(context.serverUrl, context.actor)})${patternText}. Follow the instructions [here](${githubEmailDocsLink}) to add or fix your email!`
+        body: `@${login} Your PR cannot be added to the queue because your email must be set on your GitHub profile${patternText}. Follow the instructions [here](${githubEmailDocsLink}) to add or fix your email on ${context.serverUrl}!`
       });
       return removePrFromQueue(pullRequest);
     }

diff --git a/test/helpers/manage-merge-queue.test.ts b/test/helpers/manage-merge-queue.test.ts
@@ -33,7 +33,6 @@ jest.mock('../../src/helpers/is-user-in-team');
 jest.mock('../../src/helpers/approvals-satisfied');
 jest.mock('../../src/helpers/create-pr-comment');
 jest.mock('../../src/utils/../../src/helpers/prepare-queued-pr-for-merge');
-jest.mock('path');
 jest.mock('@actions/core');
 jest.mock('@actions/github', () => ({
   context: { repo: { repo: 'repo', owner: 'owner' }, issue: { number: 123 }, serverUrl: 'sampleUrl' },