From 8ffd26eb3c65cbf09e193e713b59d50c75befd3a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sat, 6 Apr 2019 17:53:36 +0200
Subject: [PATCH] refactor: getCommitMessage
---
.../repository/onboarding/branch/rebase.js | 31 ++++++++++++-------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/lib/workers/repository/onboarding/branch/rebase.js b/lib/workers/repository/onboarding/branch/rebase.js
index a67542de64..4e1ed81b52 100644
--- a/lib/workers/repository/onboarding/branch/rebase.js
+++ b/lib/workers/repository/onboarding/branch/rebase.js
@@ -6,6 +6,22 @@ const {
const defaultConfigFile = configFileNames[0];
+function getCommitMessage(config) {
+ let commitMessage;
+ // istanbul ignore if
+ if (config.semanticCommits) {
+ commitMessage = config.semanticCommitType;
+ if (config.semanticCommitScope) {
+ commitMessage += `(${config.semanticCommitScope})`;
+ }
+ commitMessage += ': ';
+ commitMessage += 'add ' + defaultConfigFile;
+ } else {
+ commitMessage = 'Add ' + defaultConfigFile;
+ }
+ return commitMessage;
+}
+
async function rebaseOnboardingBranch(config) {
logger.debug('Checking if onboarding branch needs rebasing');
const pr = await platform.getBranchPr(onboardingBranch);
@@ -23,18 +39,9 @@ async function rebaseOnboardingBranch(config) {
return;
}
logger.info('Rebasing onboarding branch');
- let commitMessage;
- // istanbul ignore if
- if (config.semanticCommits) {
- commitMessage = config.semanticCommitType;
- if (config.semanticCommitScope) {
- commitMessage += `(${config.semanticCommitScope})`;
- }
- commitMessage += ': ';
- commitMessage += 'add ' + defaultConfigFile;
- } else {
- commitMessage = 'Add ' + defaultConfigFile;
- }
+ // istanbul ignore next
+ const commitMessage = getCommitMessage(config);
+
// istanbul ignore if
if (config.dryRun) {
logger.info('DRY-RUN: Would rebase files in onboarding branch');
--
GitLab