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 a960856a38fd60ca96eda002039d2a9a465fd059..c403cbb8b89076ebd68ea6bb3b74750c3860c660 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 51b35a9df8d6e55e2d18e610c961d6e4cc9007ec..c1eec93f114d8e60e3d92970175d017efdc76d40 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 c6d65f0409bcf25f72faec045c8aadca16ba35e9..76cdb4b08ac79a60dae2304eecfb4bae1077c53e 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`; }