diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts index a2eabaeecd70e4fdc307fb5b123d507ce884e2f8..782ec1dc7c0b3c9210e15ddda3dc42e9a0868f81 100644 --- a/lib/workers/repository/updates/generate.spec.ts +++ b/lib/workers/repository/updates/generate.spec.ts @@ -1078,6 +1078,29 @@ describe('workers/repository/updates/generate', () => { ); }); + it('generates pretty version name properly', () => { + const branch: BranchUpgradeConfig[] = [ + { + ...defaultConfig, + depName: 'some-dep', + isSingleVersion: true, + manager: 'some-manager', + newValue: 'foo-pkg-v3.2.1', + newVersion: 'foo-pkg-v3.2.1', + semanticCommits: 'enabled', + semanticCommitScope: 'package', + semanticCommitType: 'chore', + } as BranchUpgradeConfig, + ]; + const res = generateBranchConfig(branch); + expect(res.prTitle).toBe( + 'chore(package): update dependency some-dep to foo-pkg-v3.2.1' + ); + expect(res.commitMessage).toBe( + 'chore(package): update dependency some-dep to foo-pkg-v3.2.1' + ); + }); + it('prevents issue with duplicating "v" character', () => { const branch: BranchUpgradeConfig[] = [ { diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts index 20ebc0de9d4d71c145d2c608b4a5d472956a4a5b..02278169c76a9299aaecf62fe1adccee12ca8992 100644 --- a/lib/workers/repository/updates/generate.ts +++ b/lib/workers/repository/updates/generate.ts @@ -12,6 +12,14 @@ import * as template from '../../../util/template'; import type { BranchConfig, BranchUpgradeConfig } from '../../types'; import { CommitMessage } from '../model/commit-message'; +function prettifyVersion(version: string): string { + if (regEx(/^\d/).test(version)) { + return `v${version}`; + } + + return version; +} + function isTypesGroup(branchUpgrades: BranchUpgradeConfig[]): boolean { return ( branchUpgrades.some(({ depName }) => depName?.startsWith('@types/')) && @@ -84,9 +92,7 @@ export function generateBranchConfig( toValues.add(upg.newValue!); // prettify newVersion and newMajor for printing if (upg.newVersion) { - upg.prettyNewVersion = upg.newVersion.startsWith('v') - ? upg.newVersion - : `v${upg.newVersion}`; + upg.prettyNewVersion = prettifyVersion(upg.newVersion); } if (upg.newMajor) { upg.prettyNewMajor = `v${upg.newMajor}`;