From 3300b5a51a56201e020ce4684fbe3352a44bec9a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 9 Nov 2018 22:11:26 +0100
Subject: [PATCH] =?UTF-8?q?fix(pr):=20don=E2=80=99t=20log=20automerged=20u?=
=?UTF-8?q?nless=20true?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/workers/pr/index.js | 4 +++-
test/workers/pr/index.spec.js | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js
index 505b292a85..d7555b83cd 100644
--- a/lib/workers/pr/index.js
+++ b/lib/workers/pr/index.js
@@ -407,7 +407,9 @@ async function checkAutoMerge(pr, config) {
return false;
}
const res = await platform.mergePr(pr.number, branchName);
- logger.info({ pr: pr.number }, 'PR automerged');
+ if (res) {
+ logger.info({ pr: pr.number }, 'PR automerged');
+ }
return res;
}
logger.debug('No automerge');
diff --git a/test/workers/pr/index.spec.js b/test/workers/pr/index.spec.js
index 4e6d831416..d2f2518d3b 100644
--- a/test/workers/pr/index.spec.js
+++ b/test/workers/pr/index.spec.js
@@ -58,6 +58,7 @@ describe('workers/pr', () => {
config.automerge = true;
pr.canRebase = true;
platform.getBranchStatus.mockReturnValueOnce('success');
+ platform.mergePr.mockReturnValueOnce(true);
await prWorker.checkAutoMerge(pr, config);
expect(platform.mergePr.mock.calls.length).toBe(1);
});
--
GitLab