Fix merge_group tests

mheap · Dec 8, 2024 · 4fc7710 · 4fc7710
1 parent 84ca23b
commit 4fc7710
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -46,7 +46,7 @@ async function action() {
 
     let issue_number = github.context.issue.number;
 
-    if (github.context.eventName === "merge_group") {
+    if (github.context.eventName === "merge_group" && !issue_number) {
       // Parse out of the ref for merge queue
       // e.g. refs/heads/gh-readonly-queue/main/pr-17-a3c310584587d4b97c2df0cb46fe050cc46a15d6
       const lastPart = github.context.ref.split("/").pop();

diff --git a/index.test.js b/index.test.js
@@ -31,6 +31,7 @@ describe("Required Labels", () => {
     core.setOutput = jest.fn();
     core.warning = jest.fn();
     core.setFailed = jest.fn();
+    core.debug = jest.fn();
   });
 
   afterEach(() => {
@@ -644,13 +645,12 @@ describe("Required Labels", () => {
 
       await action();
     });
-
   });
 
-  describe("merge_queue", () => {
+  describe("merge_group", () => {
     it("extracts the PR number from the ref if needed", async () => {
       restoreTest = mockEvent(
-        "merge_queue",
+        "merge_group",
         {},
         {
           INPUT_LABELS: "enhancement",
@@ -673,7 +673,7 @@ describe("Required Labels", () => {
 
     it("prefers the issue number that is set in the payload to extracting from a ref", async () => {
       restoreTest = mockEvent(
-        "merge_queue",
+        "merge_group",
         {
           issue: {
             number: 28,