From 4b2f523a1794d71b5a03b6f59b01d07d4296d3b0 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 17 Jun 2020 09:48:07 +0200
Subject: [PATCH] fix: correct baseBranches description in onboarding PR
Closes #6527
---
.../pr/__snapshots__/base-branch.spec.ts.snap | 2 ++
.../repository/onboarding/pr/base-branch.spec.ts | 7 ++++++-
lib/workers/repository/onboarding/pr/base-branch.ts | 12 +++++++++---
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/lib/workers/repository/onboarding/pr/__snapshots__/base-branch.spec.ts.snap b/lib/workers/repository/onboarding/pr/__snapshots__/base-branch.spec.ts.snap
index a960856a38..c403cbb8b8 100644
--- a/lib/workers/repository/onboarding/pr/__snapshots__/base-branch.spec.ts.snap
+++ b/lib/workers/repository/onboarding/pr/__snapshots__/base-branch.spec.ts.snap
@@ -5,3 +5,5 @@ exports[`workers/repository/onboarding/pr/base-branch getBaseBranchDesc() descri
"
`;
+
+exports[`workers/repository/onboarding/pr/base-branch getBaseBranchDesc() describes baseBranches 1`] = `"You have configured Renovate to use the following baseBranches: \`some-branch\`, \`some-other-branch\`."`;
diff --git a/lib/workers/repository/onboarding/pr/base-branch.spec.ts b/lib/workers/repository/onboarding/pr/base-branch.spec.ts
index 51b35a9df8..c1eec93f11 100644
--- a/lib/workers/repository/onboarding/pr/base-branch.spec.ts
+++ b/lib/workers/repository/onboarding/pr/base-branch.spec.ts
@@ -14,7 +14,12 @@ describe('workers/repository/onboarding/pr/base-branch', () => {
expect(res).toEqual('');
});
it('describes baseBranch', () => {
- config.baseBranch = 'some-branch';
+ config.baseBranches = ['some-branch'];
+ const res = getBaseBranchDesc(config);
+ expect(res).toMatchSnapshot();
+ });
+ it('describes baseBranches', () => {
+ config.baseBranches = ['some-branch', 'some-other-branch'];
const res = getBaseBranchDesc(config);
expect(res).toMatchSnapshot();
});
diff --git a/lib/workers/repository/onboarding/pr/base-branch.ts b/lib/workers/repository/onboarding/pr/base-branch.ts
index c6d65f0409..76cdb4b08a 100644
--- a/lib/workers/repository/onboarding/pr/base-branch.ts
+++ b/lib/workers/repository/onboarding/pr/base-branch.ts
@@ -2,7 +2,13 @@ import { RenovateConfig } from '../../../../config';
export function getBaseBranchDesc(config: RenovateConfig): string {
// Describe base branch only if it's configured
- return config.baseBranch
- ? `You have configured Renovate to use branch \`${config.baseBranch}\` as base branch.\n\n`
- : '';
+ if (!config.baseBranches?.length) {
+ return '';
+ }
+ if (config.baseBranches.length > 1) {
+ return `You have configured Renovate to use the following baseBranches: ${config.baseBranches
+ .map((branch) => `\`${branch}\``)
+ .join(', ')}.`;
+ }
+ return `You have configured Renovate to use branch \`${config.baseBranches[0]}\` as base branch.\n\n`;
}
--
GitLab