bugfix-314-error-merging-release-branch-after-successful-deployment: Enhance MergeRepository to handle fallback to status checks when no PR-specific check runs are available after polling. Added test case to verify that the merge process correctly waits for pending status checks before proceeding. This improves the robustness of the merging logic and ensures proper handling of check statuses.

Author: efraespada

src/data/repository/__tests__/merge_repository.test.ts

@@ -293,6 +293,49 @@ describe('MergeRepository', () => {
         expect(mockPullsMerge).toHaveBeenCalled();
     });
 
+    it('when no check runs for this PR after max polls but status checks are pending, falls back to status checks and waits then merges', async () => {
+        jest.useFakeTimers();
+        mockPullsCreate.mockResolvedValue({ data: { number: 99 } });
+        mockPullsListCommits.mockResolvedValue({ data: [] });
+        mockPullsUpdate.mockResolvedValue({});
+        mockPullsMerge.mockResolvedValue({});
+        // Check runs on ref are for another PR only; this PR (99) has none.
+        mockChecksListForRef.mockResolvedValue({
+            data: {
+                check_runs: [
+                    { name: 'ci', status: 'completed', conclusion: 'success', pull_requests: [{ number: 1 }] },
+                ],
+            },
+        });
+        // First 4 polls: pending status check; 5th: completed so we proceed to merge.
+        mockReposGetCombinedStatusForRef
+            .mockResolvedValueOnce({
+                data: { state: 'pending', statuses: [{ context: 'ci', state: 'pending' }] },
+            })
+            .mockResolvedValueOnce({
+                data: { state: 'pending', statuses: [{ context: 'ci', state: 'pending' }] },
+            })
+            .mockResolvedValueOnce({
+                data: { state: 'pending', statuses: [{ context: 'ci', state: 'pending' }] },
+            })
+            .mockResolvedValueOnce({
+                data: { state: 'pending', statuses: [{ context: 'ci', state: 'pending' }] },
+            })
+            .mockResolvedValue({
+                data: { state: 'success', statuses: [{ context: 'ci', state: 'success' }] },
+            });
+
+        const promise = repo.mergeBranch('o', 'r', 'release/1.0', 'develop', 60, 'token');
+        await jest.runAllTimersAsync();
+        const result = await promise;
+
+        jest.useRealTimers();
+        expect(result).toHaveLength(1);
+        expect(result[0].success).toBe(true);
+        expect(mockReposGetCombinedStatusForRef).toHaveBeenCalled();
+        expect(mockPullsMerge).toHaveBeenCalled();
+    });
+
     it('when timeout > 10 and checks never complete throws then direct merge succeeds', async () => {
         jest.useFakeTimers();
         mockPullsCreate.mockResolvedValue({ data: { number: 1 } });

src/data/repository/merge_repository.ts

@@ -133,10 +133,28 @@ This PR merges **${head}** into **${base}**.
                         // haven't registered yet, or this PR/base has no required checks.
                         waitForPrChecksAttempts++;
                         if (waitForPrChecksAttempts >= maxWaitForPrChecksAttempts) {
-                            checksCompleted = true;
-                            logDebugInfo(
-                                `No check runs for this PR after ${maxWaitForPrChecksAttempts} polls; proceeding to merge (branch may have no required checks).`,
-                            );
+                            // Give up waiting for PR-specific check runs; fall back to status checks
+                            // before proceeding to merge (PR may have required status checks).
+                            const pendingChecksFallback = commitStatus.statuses.filter(status => {
+                                logDebugInfo(`Status check (fallback): ${status.context} (State: ${status.state})`);
+                                return status.state === 'pending';
+                            });
+
+                            if (pendingChecksFallback.length === 0) {
+                                checksCompleted = true;
+                                logDebugInfo(
+                                    `No check runs for this PR after ${maxWaitForPrChecksAttempts} polls; no pending status checks; proceeding to merge.`,
+                                );
+                            } else {
+                                logDebugInfo(
+                                    `No check runs for this PR after ${maxWaitForPrChecksAttempts} polls; falling back to status checks. Waiting for ${pendingChecksFallback.length} status checks to complete.`,
+                                );
+                                pendingChecksFallback.forEach(check => {
+                                    logDebugInfo(`  - ${check.context} (State: ${check.state})`);
+                                });
+                                await new Promise(resolve => setTimeout(resolve, iteration * 1000));
+                                attempts++;
+                            }
                         } else {
                             logDebugInfo('Check runs exist on ref but none for this PR yet; waiting for workflows to register.');
                             await new Promise(resolve => setTimeout(resolve, iteration * 1000));