From ae38fd5d0642b70d586c242e49414c5323a8e5c6 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Sun, 6 Aug 2017 06:36:04 +0200
Subject: [PATCH] fix: return false after successful branch automerge (#631)
This prevents attempts to view the PR or check branch status again.
Fixes #499
---
lib/workers/branch/index.js | 1 +
test/workers/branch/index.spec.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js
index 42ec44e3a0..e2d0b321a1 100644
--- a/lib/workers/branch/index.js
+++ b/lib/workers/branch/index.js
@@ -202,6 +202,7 @@ async function ensureBranch(config) {
logger.info(`Automerging branch`);
try {
await api.mergeBranch(branchName, config.automergeType);
+ return false; // Branch no longer exists
} catch (err) {
logger.error({ err }, `Failed to automerge branch`);
throw err;
diff --git a/test/workers/branch/index.spec.js b/test/workers/branch/index.spec.js
index 40e33c75d9..973c92ca9d 100644
--- a/test/workers/branch/index.spec.js
+++ b/test/workers/branch/index.spec.js
@@ -169,7 +169,7 @@ describe('workers/branch', () => {
config.api.mergeBranch = jest.fn();
config.automergeEnabled = true;
config.automergeType = 'branch-push';
- expect(await branchWorker.ensureBranch(config)).toBe(true);
+ expect(await branchWorker.ensureBranch(config)).toBe(false);
expect(branchWorker.getParentBranch.mock.calls.length).toBe(1);
expect(config.api.getBranchStatus.mock.calls.length).toBe(1);
expect(config.api.mergeBranch.mock).toMatchSnapshot();
--
GitLab