Final improvements and more tests

Author: MattyTheHacker

src/autoupdater.ts

@@ -492,7 +492,25 @@ export class AutoUpdater {
               return false;
             } else if (mergeConflictAction === 'label') {
               ghCore.info('Merge conflict detected, labelling with label: ' + mergeConflictLabel);
-              
+              // Fetch current labels on the PR
+              const { data: prData } = await this.octokit.rest.pulls.get({
+                owner: mergeOpts.owner as string,
+                repo: mergeOpts.repo as string,
+                pull_number: prNumber,
+              });
+              const currentLabels = prData.labels.map((l: any) => l.name).filter(Boolean);
+              if (!currentLabels.includes(mergeConflictLabel)) {
+                const newLabels = [...currentLabels, mergeConflictLabel];
+                await this.octokit.rest.issues.update({
+                  owner: mergeOpts.owner as string,
+                  repo: mergeOpts.repo as string,
+                  issue_number: prNumber,
+                  labels: newLabels,
+                });
+                ghCore.info(`Added merge conflict label '${mergeConflictLabel}' to PR #${prNumber}.`);
+              } else {
+                ghCore.info(`Merge conflict label '${mergeConflictLabel}' already present on PR #${prNumber}.`);
+              }
               return false;
             } else {
               // Else, throw an error so we don't continue retrying.

test/autoupdate.test.ts

@@ -1324,28 +1324,88 @@ describe('test `merge`', () => {
     }
   });
 
-  test('label merge conflicts', async () => {
+  test('merge conflict label is configured and merge conflict label is already present', async () => {
     (config.retryCount as jest.Mock).mockReturnValue(0);
     (config.mergeConflictAction as jest.Mock).mockReturnValue('label');
-    (config.mergeConflictLabel as jest.Mock).mockReturnValue('conflicted');
+    (config.mergeConflictLabel as jest.Mock).mockReturnValue('merge-conflict');
     const updater = new AutoUpdater(config, emptyEvent);
 
-    const scope = nock('https://api.github.com:443')
+    // Mock the PR labels to already include the merge conflict label
+    const prNumber = 1;
+    const existingLabels = [
+      { id: 1, name: 'bug' },
+      { id: 2, name: 'merge-conflict' },
+    ];
+
+    // nock for merge attempt (409 merge conflict)
+    const mergeScope = nock('https://api.github.com:443')
       .post(`/repos/${owner}/${repo}/merges`, {
         commit_message: mergeOpts.commit_message,
         base: mergeOpts.base,
         head: mergeOpts.head,
       })
-      .reply(409, {
-        message: 'Merge conflict',
-      });
+      .reply(409, { message: 'Merge conflict' });
+
+    const getScope = nock('https://api.github.com:443')
+      .get(`/repos/${owner}/${repo}/pulls/${prNumber}`)
+      .reply(200, { labels: existingLabels });
+
+    const updateScope = nock('https://api.github.com:443')
+      .patch(`/repos/${owner}/${repo}/issues/${prNumber}`)
+      .reply(200, {});
 
     const setOutput = jest.fn();
-    await updater.merge(owner, 1, mergeOpts, setOutput);
+    const infoSpy = jest.spyOn(require('@actions/core'), 'info');
 
-    expect(scope.isDone()).toEqual(true);
+    await updater.merge(owner, prNumber, mergeOpts, setOutput);
 
-    expect(setOutput).toHaveBeenCalledTimes(1);
-    expect(setOutput).toHaveBeenCalledWith(Output.Conflicted, true);
+    expect(mergeScope.isDone()).toBe(true);
+    expect(getScope.isDone()).toBe(true);
+    expect(updateScope.isDone()).toBe(false);
+    expect(infoSpy).toHaveBeenCalledWith(
+      expect.stringContaining("already present")
+    );
+  });
+
+  test('merge conflict label is configured and merge conflict label is not present', async () => {
+    (config.retryCount as jest.Mock).mockReturnValue(0);
+    (config.mergeConflictAction as jest.Mock).mockReturnValue('label');
+    (config.mergeConflictLabel as jest.Mock).mockReturnValue('merge-conflict');
+    const updater = new AutoUpdater(config, emptyEvent);
+
+    // Mock the PR labels to already include the merge conflict label
+    const prNumber = 1;
+    const existingLabels = [
+      { id: 1, name: 'bug' },
+    ];
+
+    // nock for merge attempt (409 merge conflict)
+    const mergeScope = nock('https://api.github.com:443')
+      .post(`/repos/${owner}/${repo}/merges`, {
+        commit_message: mergeOpts.commit_message,
+        base: mergeOpts.base,
+        head: mergeOpts.head,
+      })
+      .reply(409, { message: 'Merge conflict' });
+
+    const getScope = nock('https://api.github.com:443')
+      .get(`/repos/${owner}/${repo}/pulls/${prNumber}`)
+      .reply(200, { labels: existingLabels });
+
+    const updateScope = nock('https://api.github.com:443')
+      .patch(`/repos/${owner}/${repo}/issues/${prNumber}`)
+      .reply(200, {});
+
+    const setOutput = jest.fn();
+    const infoSpy = jest.spyOn(require('@actions/core'), 'info');
+
+    await updater.merge(owner, prNumber, mergeOpts, setOutput);
+
+    expect(mergeScope.isDone()).toBe(true);
+    expect(getScope.isDone()).toBe(true);
+    expect(updateScope.isDone()).toBe(false);
+    expect(infoSpy).toHaveBeenCalledWith(
+      expect.stringContaining("Added merge conflict label")
+    );
   });
 });