refactor

ExpediaGroup · Sep 12, 2024 · f191ba0 · f191ba0
1 parent c3cd30d
commit f191ba0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/dist/676.index.js b/dist/676.index.js
diff --git a/dist/676.index.js.map b/dist/676.index.js.map
diff --git a/src/helpers/prepare-queued-pr-for-merge.ts b/src/helpers/prepare-queued-pr-for-merge.ts
@@ -59,9 +59,17 @@ export const updatePrWithDefaultBranch = async (pullRequest: PullRequest) => {
     });
   } catch (error) {
     const noEvictUponConflict = core.getInput('no_evict_upon_conflict');
-    if ((error as GithubError).status === 409) {
-      if (noEvictUponConflict !== 'true') await removePrFromQueue(pullRequest);
-      core.setFailed('The first PR in the queue has a merge conflict.');
-    } else core.setFailed((error as GithubError).message);
+    const githubError = error as GithubError;
+    if (githubError.status !== 409) {
+      core.setFailed(githubError.message);
+      return;
+    }
+    if (noEvictUponConflict === 'true') {
+      core.info('The first PR in the queue has a merge conflict. PR was not removed from the queue due to no_evict_upon_conflict input.');
+      return;
+    }
+
+    await removePrFromQueue(pullRequest);
+    core.setFailed('The first PR in the queue has a merge conflict, and it was removed from the queue.');
   }
 };
diff --git a/test/helpers/prepare-queued-pr-for-merge.test.ts b/test/helpers/prepare-queued-pr-for-merge.test.ts
@@ -350,9 +350,9 @@ describe('prepareQueuedPrForMerge', () => {
       await prepareQueuedPrForMerge();
     });
 
-    it('should NOT remove PR from queue and call core.error', () => {
+    it('should NOT remove PR from queue and call core.info', () => {
       expect(removePrFromQueue).not.toHaveBeenCalled();
-      expect(core.setFailed).toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalled();
     });
   });