diff --git a/docs/configuration.md b/docs/configuration.md index 5bfc7a5614ed47db7594aef8ebc265e5c972a5c4..5d5af43a59f02f6f753568bdcbaa2b79060d78c9 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -526,7 +526,7 @@ Obviously, you can't set repository or package file location with this method. <td>`commitMessage`</td> <td>Commit message template</td> <td>string</td> - <td><pre>"{{semanticPrefix}}Update dependency {{depName}} to version {{newVersion}}"</pre></td> + <td><pre>"Update dependency {{depName}} to version {{newVersion}}"</pre></td> <td>`RENOVATE_COMMIT_MESSAGE`</td> <td><td> </tr> @@ -534,7 +534,7 @@ Obviously, you can't set repository or package file location with this method. <td>`prTitle`</td> <td>Pull Request title template</td> <td>string</td> - <td><pre>"{{semanticPrefix}}{{#if isPin}}Pin{{else}}{{#if isRollback}}Roll back{{else}}Update{{/if}}{{/if}} dependency {{depName}} to version {{#if isRange}}{{newVersion}}{{else}}{{#if isMajor}}{{newVersionMajor}}.x{{else}}{{newVersion}}{{/if}}{{/if}}"</pre></td> + <td><pre>"{{#if isPin}}Pin{{else}}{{#if isRollback}}Roll back{{else}}Update{{/if}}{{/if}} dependency {{depName}} to version {{#if isRange}}{{newVersion}}{{else}}{{#if isMajor}}{{newVersionMajor}}.x{{else}}{{newVersion}}{{/if}}{{/if}}"</pre></td> <td>`RENOVATE_PR_TITLE`</td> <td><td> </tr> @@ -563,8 +563,8 @@ Obviously, you can't set repository or package file location with this method. "groupName": "Lock File Maintenance", "recreateClosed": true, "branchName": "{{branchPrefix}}lock-file-maintenance", - "commitMessage": "{{semanticPrefix}}Update lock file", - "prTitle": "{{semanticPrefix}}Lock file maintenance", + "commitMessage": "Update lock file", + "prTitle": "Lock file maintenance", "prBody": "This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request updates `package.json` lock files to use the latest dependency versions.\n\n{{#if schedule}}\n**Note**: This PR was created on a configured schedule (\"{{schedule}}\"{{#if timezone}} in timezone `{{timezone}}`{{/if}}) and will not receive updates outside those times.\n{{/if}}\n\n{{#if hasErrors}}\n\n---\n\n### Errors\n\nRenovate encountered some errors when processing your repository, so you are being notified here even if they do not directly apply to this PR.\n\n{{#each errors as |error|}}\n- `{{error.depName}}`: {{error.message}}\n{{/each}}\n{{/if}}\n\n{{#if hasWarnings}}\n\n---\n\n### Warnings\n\nPlease make sure the following warnings are safe to ignore:\n\n{{#each warnings as |warning|}}\n- `{{warning.depName}}`: {{warning.message}}\n{{/each}}\n{{/if}}\n\n---\n\nThis {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://renovateapp.com).", "schedule": ["before 5am on monday"] }</pre></td> @@ -602,8 +602,8 @@ Obviously, you can't set repository or package file location with this method. <td><pre>{ "recreateClosed": true, "branchName": "{{branchPrefix}}{{groupSlug}}", - "commitMessage": "{{semanticPrefix}}Renovate {{groupName}} packages", - "prTitle": "{{semanticPrefix}}Renovate {{groupName}} packages", + "commitMessage": "Renovate {{groupName}} packages", + "prTitle": "Renovate {{groupName}} packages", "prBody": "This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request renovates the package group \"{{groupName}}\".\n\n{{#if schedule}}\n**Note**: This PR was created on a configured schedule (\"{{schedule}}\"{{#if timezone}} in timezone `{{timezone}}`{{/if}}) and will not receive updates outside those times.\n{{/if}}\n\n{{#each upgrades as |upgrade|}}\n- {{#if repositoryUrl}}[{{upgrade.depName}}]({{upgrade.repositoryUrl}}){{else}}`{{depName}}`{{/if}}: from `{{upgrade.currentVersion}}` to `{{upgrade.newVersion}}`\n{{/each}}\n\n{{#unless isPin}}\n### Commits\n\n{{#each upgrades as |upgrade|}}\n{{#if upgrade.releases.length}}\n<details>\n<summary>{{upgrade.githubName}}</summary>\n{{#each upgrade.releases as |release|}}\n\n#### {{release.version}}\n{{#each release.commits as |commit|}}\n- [`{{commit.shortSha}}`]({{commit.url}}){{commit.message}}\n{{/each}}\n{{/each}}\n\n</details>\n{{/if}}\n{{/each}}\n{{/unless}}\n<br />\n\n{{#if hasErrors}}\n\n---\n\n### Errors\n\nRenovate encountered some errors when processing your repository, so you are being notified here even if they do not directly apply to this PR.\n\n{{#each errors as |error|}}\n- `{{error.depName}}`: {{error.message}}\n{{/each}}\n{{/if}}\n\n{{#if hasWarnings}}\n\n---\n\n### Warnings\n\nPlease make sure the following warnings are safe to ignore:\n\n{{#each warnings as |warning|}}\n- `{{warning.depName}}`: {{warning.message}}\n{{/each}}\n{{/if}}\n\n---\n\nThis {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://renovateapp.com)." }</pre></td> <td></td> diff --git a/lib/config/definitions.js b/lib/config/definitions.js index a64e49b5c04e7e24b77fc1d86bc6e26b6c4c7fcc..a7458b1a3ae27381d7a6e67118f81405cb9b3379 100644 --- a/lib/config/definitions.js +++ b/lib/config/definitions.js @@ -322,7 +322,7 @@ const options = [ name: 'semanticPrefix', description: 'Prefix to use if semantic commits are enabled', type: 'string', - default: 'chore(deps): ', + default: 'chore(deps):', }, // PR Behaviour { diff --git a/lib/config/migration.js b/lib/config/migration.js index 04f1d9ba43e7b6eb7b517091313c28b05626b8bf..fabfaa4bfe9440ca46cf269ad9cdfcfea47c17cd 100644 --- a/lib/config/migration.js +++ b/lib/config/migration.js @@ -41,6 +41,19 @@ function migrateConfig(config) { isMigrated = true; migratedConfig.packagePatterns = [val]; delete migratedConfig.packagePattern; + } else if ( + typeof val === 'string' && + val.indexOf('{{semanticPrefix}}') === 0 + ) { + isMigrated = true; + migratedConfig[key] = val.replace('{{semanticPrefix}}', ''); + } else if (key === 'semanticPrefix') { + console.log('Migrating semanticPrefix'); + // strip trailing space + if (val && val[val.length - 1] === ' ') { + isMigrated = true; + migratedConfig[key] = val.substring(0, val.length - 1); + } } else if (key === 'depTypes' && Array.isArray(val)) { val.forEach(depType => { if (isObject(depType)) { diff --git a/lib/config/templates/default/commit-message.hbs b/lib/config/templates/default/commit-message.hbs index b5eb201bc78b223badc69b38503f3e802705c8a3..f5f14d831a4cb2498e6de1ff4aa51feae60f2b42 100644 --- a/lib/config/templates/default/commit-message.hbs +++ b/lib/config/templates/default/commit-message.hbs @@ -1 +1 @@ -{{semanticPrefix}}Update dependency {{depName}} to v{{newVersion}} +Update dependency {{depName}} to v{{newVersion}} diff --git a/lib/config/templates/default/pr-title.hbs b/lib/config/templates/default/pr-title.hbs index 8565257e77425bbad06d166ac1001a6386fc7903..e2cc17494de8b8b828b2b192894d642191abc37a 100644 --- a/lib/config/templates/default/pr-title.hbs +++ b/lib/config/templates/default/pr-title.hbs @@ -1 +1 @@ -{{semanticPrefix}}{{#if isPin}}Pin{{else}}{{#if isRollback}}Roll back{{else}}Update{{/if}}{{/if}} dependency {{depName}} to {{#if isRange}}{{newVersion}}{{else}}{{#if isMajor}}v{{newVersionMajor}}{{else}}v{{newVersion}}{{/if}}{{/if}} +{{#if isPin}}Pin{{else}}{{#if isRollback}}Roll back{{else}}Update{{/if}}{{/if}} dependency {{depName}} to {{#if isRange}}{{newVersion}}{{else}}{{#if isMajor}}v{{newVersionMajor}}{{else}}v{{newVersion}}{{/if}}{{/if}} diff --git a/lib/config/templates/group/commit-message.hbs b/lib/config/templates/group/commit-message.hbs index c6b194c27b3852733354a02aa67ffa6e223a91d1..468a723413b038b75b7f0f0961c0126e5b69cec4 100644 --- a/lib/config/templates/group/commit-message.hbs +++ b/lib/config/templates/group/commit-message.hbs @@ -1 +1 @@ -{{semanticPrefix}}Renovate {{groupName}} packages +Renovate {{groupName}} packages diff --git a/lib/config/templates/group/pr-title.hbs b/lib/config/templates/group/pr-title.hbs index c6b194c27b3852733354a02aa67ffa6e223a91d1..468a723413b038b75b7f0f0961c0126e5b69cec4 100644 --- a/lib/config/templates/group/pr-title.hbs +++ b/lib/config/templates/group/pr-title.hbs @@ -1 +1 @@ -{{semanticPrefix}}Renovate {{groupName}} packages +Renovate {{groupName}} packages diff --git a/lib/config/templates/lock-file-maintenance/commit-message.hbs b/lib/config/templates/lock-file-maintenance/commit-message.hbs index 0019519a693e5b7f3d78f6c88a65ec942c018910..4637bf90cd7b3c25dbed1169f4ea7ba03bce5636 100644 --- a/lib/config/templates/lock-file-maintenance/commit-message.hbs +++ b/lib/config/templates/lock-file-maintenance/commit-message.hbs @@ -1 +1 @@ -{{semanticPrefix}}Update lock file +Update lock file diff --git a/lib/config/templates/lock-file-maintenance/pr-title.hbs b/lib/config/templates/lock-file-maintenance/pr-title.hbs index e441b42cf2e7f393ff4855638adb87161caac2c8..c5d18441be75eb7ac8e107b1fa2a2e994ca1ee8a 100644 --- a/lib/config/templates/lock-file-maintenance/pr-title.hbs +++ b/lib/config/templates/lock-file-maintenance/pr-title.hbs @@ -1 +1 @@ -{{semanticPrefix}}Lock file maintenance +Lock file maintenance diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js index dcbb653383e357e961957ef1e9a79666e8eefbed..445d2ea07bdc81b5cfdd6e4c8183084f5155f7fb 100644 --- a/lib/workers/branch/index.js +++ b/lib/workers/branch/index.js @@ -83,7 +83,7 @@ async function ensureBranch(config) { let commitMessage = handlebars.compile(config.commitMessage)(config); if (config.semanticCommits) { - commitMessage = commitMessage.toLowerCase(); + commitMessage = `${config.semanticPrefix} ${commitMessage.toLowerCase()}`; } const api = config.api; const cacheFolder = config.yarnCacheFolder; diff --git a/lib/workers/package/versions.js b/lib/workers/package/versions.js index 87712a1f8ee23b3cbc8e1d15c7729ea00804eb1a..92b5cfb61926a563890ba5a226221c8ce595c2a4 100644 --- a/lib/workers/package/versions.js +++ b/lib/workers/package/versions.js @@ -40,8 +40,8 @@ function determineUpgrades(npmDep, config) { newVersionMajor: semver.major(maxSatisfying), groupName: 'Pin Dependencies', group: { - prTitle: '{{semanticPrefix}}{{groupName}}', - semanticPrefix: 'refactor(deps): ', + prTitle: '{{groupName}}', + semanticPrefix: 'refactor(deps):', }, }; changeLogFromVersion = maxSatisfying; @@ -55,7 +55,7 @@ function determineUpgrades(npmDep, config) { isRollback: true, newVersion: rollbackVersion, newVersionMajor: semver.major(rollbackVersion), - semanticPrefix: 'fix(deps): ', + semanticPrefix: 'fix(deps):', branchName: '{{branchPrefix}}rollback-{{depName}}-{{newVersionMajor}}.x', }; } diff --git a/lib/workers/repository/upgrades.js b/lib/workers/repository/upgrades.js index 8f6b11b9ed578376b078c5a3225abf040acd7f7b..48f3db78bbf9372720869dc419ba7f6b9ce2e83e 100644 --- a/lib/workers/repository/upgrades.js +++ b/lib/workers/repository/upgrades.js @@ -54,19 +54,13 @@ function generateConfig(branchUpgrades) { // Delete group config regardless of whether it was applied delete upgrade.group; delete upgrade.lazyGrouping; - // Delete the semanticPrefix for this upgrade if not enabled - if (upgrade.semanticCommits) { - logger.debug('Upgrade has semantic commits enabled'); - } else { - logger.debug('Upgrade has semantic commits disabled'); - delete upgrade.semanticPrefix; - } // Use templates to generate strings logger.debug('Compiling branchName and prTitle'); upgrade.branchName = handlebars.compile(upgrade.branchName)(upgrade); upgrade.prTitle = handlebars.compile(upgrade.prTitle)(upgrade); if (upgrade.semanticCommits) { - upgrade.prTitle = upgrade.prTitle.toLowerCase(); + logger.debug('Upgrade has semantic commits enabled'); + upgrade.prTitle = `${upgrade.semanticPrefix} ${upgrade.prTitle.toLowerCase()}`; } logger.debug(`${upgrade.branchName}, ${upgrade.prTitle}`); config.upgrades.push(upgrade); diff --git a/test/config/__snapshots__/index.spec.js.snap b/test/config/__snapshots__/index.spec.js.snap index 7e261d96f1daa8a1a27c6f9d5fcd328289672966..710412d130ff2e9fdebc014aa80e106da19ef1e5 100644 --- a/test/config/__snapshots__/index.spec.js.snap +++ b/test/config/__snapshots__/index.spec.js.snap @@ -3,7 +3,7 @@ exports[`config/index mergeChildConfig(parentConfig, childConfig) merges 1`] = ` Object { "branchName": "{{branchPrefix}}lock-file-maintenance", - "commitMessage": "{{semanticPrefix}}Update lock file", + "commitMessage": "Update lock file", "enabled": true, "groupName": "Lock File Maintenance", "prBody": "This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request updates \`package.json\` lock files to use the latest dependency versions. @@ -41,7 +41,7 @@ Please make sure the following warnings are safe to ignore: --- This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://renovateapp.com).", - "prTitle": "{{semanticPrefix}}Lock file maintenance", + "prTitle": "Lock file maintenance", "recreateClosed": true, "schedule": Array [ "on monday", diff --git a/test/config/__snapshots__/migration.spec.js.snap b/test/config/__snapshots__/migration.spec.js.snap index cafa25b24e6b1545d44cdf48e4699393c8b697bc..1624dd6e3cca724621445f7add341c9b7ca5a96a 100644 --- a/test/config/__snapshots__/migration.spec.js.snap +++ b/test/config/__snapshots__/migration.spec.js.snap @@ -2,6 +2,7 @@ exports[`config/migration migrateConfig(config) it migrates config 1`] = ` Object { + "commitMessage": "some commit message", "enabled": true, "optionalDependencies": Object { "respectLatest": false, @@ -17,9 +18,11 @@ Object { ], }, ], + "prTitle": "some pr title", "schedule": Array [ "after 5pm", ], + "semanticPrefix": "fix(deps):", } `; diff --git a/test/config/migration.spec.js b/test/config/migration.spec.js index 0632f6ce47140d504b648138795512348bf7f7d1..42374ce0bb0290121c1355d56a3176c433d4f9f8 100644 --- a/test/config/migration.spec.js +++ b/test/config/migration.spec.js @@ -7,6 +7,9 @@ describe('config/migration', () => { enabled: true, maintainYarnLock: true, schedule: 'after 5pm', + commitMessage: '{{semanticPrefix}}some commit message', + prTitle: '{{semanticPrefix}}some pr title', + semanticPrefix: 'fix(deps): ', packages: [ { packageName: 'angular', diff --git a/test/workers/package/__snapshots__/index.spec.js.snap b/test/workers/package/__snapshots__/index.spec.js.snap index bf15efd7038d8c1cb2591d075b45f611e2b813ad..78a9ad39ffd65777de058705a5b19d9d626c0243 100644 --- a/test/workers/package/__snapshots__/index.spec.js.snap +++ b/test/workers/package/__snapshots__/index.spec.js.snap @@ -69,12 +69,12 @@ Array [ "automergeType": "pr", "branchName": "{{branchPrefix}}{{depName}}-{{newVersionMajor}}.x", "branchPrefix": "renovate/", - "commitMessage": "{{semanticPrefix}}Update dependency {{depName}} to v{{newVersion}}", + "commitMessage": "Update dependency {{depName}} to v{{newVersion}}", "currentVersion": "1.0.0", "depName": "foo", "group": Object { "branchName": "{{branchPrefix}}{{groupSlug}}", - "commitMessage": "{{semanticPrefix}}Renovate {{groupName}} packages", + "commitMessage": "Renovate {{groupName}} packages", "prBody": "This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request renovates the package group \\"{{groupName}}\\". {{#if schedule}} @@ -135,7 +135,7 @@ Please make sure the following warnings are safe to ignore: --- This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://renovateapp.com).", - "prTitle": "{{semanticPrefix}}Renovate {{groupName}} packages", + "prTitle": "Renovate {{groupName}} packages", "recreateClosed": true, }, "groupName": null, @@ -195,7 +195,7 @@ Please make sure the following warnings are safe to ignore: This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://renovateapp.com).", "prCreation": "immediate", - "prTitle": "{{semanticPrefix}}{{#if isPin}}Pin{{else}}{{#if isRollback}}Roll back{{else}}Update{{/if}}{{/if}} dependency {{depName}} to {{#if isRange}}{{newVersion}}{{else}}{{#if isMajor}}v{{newVersionMajor}}{{else}}v{{newVersion}}{{/if}}{{/if}}", + "prTitle": "{{#if isPin}}Pin{{else}}{{#if isRollback}}Roll back{{else}}Update{{/if}}{{/if}} dependency {{depName}} to {{#if isRange}}{{newVersion}}{{else}}{{#if isMajor}}v{{newVersionMajor}}{{else}}v{{newVersion}}{{/if}}{{/if}}", "rebaseStalePrs": false, "recreateClosed": false, "repoIsOnboarded": true, @@ -204,7 +204,7 @@ This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](ht "reviewers": Array [], "schedule": "some schedule", "semanticCommits": false, - "semanticPrefix": "chore(deps): ", + "semanticPrefix": "chore(deps):", "timezone": null, "type": "error", }, diff --git a/test/workers/package/__snapshots__/versions.spec.js.snap b/test/workers/package/__snapshots__/versions.spec.js.snap index 5d9efb4af315752280d2c0c710e54fa74757d00c..7352538b6f6d83acfc0bc60a38e4590433a502f7 100644 --- a/test/workers/package/__snapshots__/versions.spec.js.snap +++ b/test/workers/package/__snapshots__/versions.spec.js.snap @@ -5,8 +5,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -64,8 +64,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -81,8 +81,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -141,8 +141,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -183,8 +183,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -210,8 +210,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -338,7 +338,7 @@ Object { "isRollback": true, "newVersion": "1.16.0", "newVersionMajor": 1, - "semanticPrefix": "fix(deps): ", + "semanticPrefix": "fix(deps):", "type": "rollback", } `; @@ -379,8 +379,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -431,8 +431,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -468,8 +468,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -511,8 +511,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -581,8 +581,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, @@ -694,8 +694,8 @@ Array [ Object { "automergeEnabled": true, "group": Object { - "prTitle": "{{semanticPrefix}}{{groupName}}", - "semanticPrefix": "refactor(deps): ", + "prTitle": "{{groupName}}", + "semanticPrefix": "refactor(deps):", }, "groupName": "Pin Dependencies", "isPin": true, diff --git a/test/workers/repository/__snapshots__/upgrades.spec.js.snap b/test/workers/repository/__snapshots__/upgrades.spec.js.snap index b76c0d02a9de342458b45830b04de5bd97444ba4..5f131342b393d30580eb1244629523fec6a49d72 100644 --- a/test/workers/repository/__snapshots__/upgrades.spec.js.snap +++ b/test/workers/repository/__snapshots__/upgrades.spec.js.snap @@ -5,15 +5,43 @@ Object { "branchName": "some-branch", "depName": "some-dep", "foo": 1, - "prTitle": "some-title", + "prTitle": "some-prefix: some-title", "semanticCommits": true, + "semanticPrefix": "some-prefix:", "upgrades": Array [ Object { "branchName": "some-branch", "depName": "some-dep", "foo": 1, - "prTitle": "some-title", + "prTitle": "some-prefix: some-title", "semanticCommits": true, + "semanticPrefix": "some-prefix:", + }, + ], +} +`; + +exports[`workers/repository/upgrades generateConfig(branchUpgrades) groups multiple upgrades 1`] = ` +Object { + "branchName": "some-branch", + "depName": "some-dep", + "foo": 2, + "groupName": "some-group", + "prTitle": "some-title", + "upgrades": Array [ + Object { + "branchName": "some-branch", + "depName": "some-dep", + "foo": 2, + "groupName": "some-group", + "prTitle": "some-title", + }, + Object { + "branchName": "some-branch", + "depName": "some-other-dep", + "foo": 2, + "groupName": "some-group", + "prTitle": "some-title", }, ], } @@ -191,29 +219,3 @@ Object { "warnings": Array [], } `; - -exports[`workers/repository/upgrades groups multiple upgrades 1`] = ` -Object { - "branchName": "some-branch", - "depName": "some-dep", - "foo": 2, - "groupName": "some-group", - "prTitle": "some-title", - "upgrades": Array [ - Object { - "branchName": "some-branch", - "depName": "some-dep", - "foo": 2, - "groupName": "some-group", - "prTitle": "some-title", - }, - Object { - "branchName": "some-branch", - "depName": "some-other-dep", - "foo": 2, - "groupName": "some-group", - "prTitle": "some-title", - }, - ], -} -`; diff --git a/test/workers/repository/upgrades.spec.js b/test/workers/repository/upgrades.spec.js index 629392e57d59cd0c19f458e91a1921f3431c5285..1563b1eb8a8725cc198bbd69d7de0eb967648b75 100644 --- a/test/workers/repository/upgrades.spec.js +++ b/test/workers/repository/upgrades.spec.js @@ -53,6 +53,7 @@ describe('workers/repository/upgrades', () => { branchName: 'some-branch', prTitle: 'some-title', semanticCommits: true, + semanticPrefix: 'some-prefix:', lazyGrouping: true, foo: 1, group: { @@ -84,36 +85,36 @@ describe('workers/repository/upgrades', () => { expect(res.groupName).toBeDefined(); expect(res).toMatchSnapshot(); }); - }); - it('groups multiple upgrades', () => { - const branchUpgrades = [ - { - depName: 'some-dep', - groupName: 'some-group', - branchName: 'some-branch', - prTitle: 'some-title', - lazyGrouping: true, - foo: 1, - group: { - foo: 2, + it('groups multiple upgrades', () => { + const branchUpgrades = [ + { + depName: 'some-dep', + groupName: 'some-group', + branchName: 'some-branch', + prTitle: 'some-title', + lazyGrouping: true, + foo: 1, + group: { + foo: 2, + }, }, - }, - { - depName: 'some-other-dep', - groupName: 'some-group', - branchName: 'some-branch', - prTitle: 'some-title', - lazyGrouping: true, - foo: 1, - group: { - foo: 2, + { + depName: 'some-other-dep', + groupName: 'some-group', + branchName: 'some-branch', + prTitle: 'some-title', + lazyGrouping: true, + foo: 1, + group: { + foo: 2, + }, }, - }, - ]; - const res = upgrades.generateConfig(branchUpgrades); - expect(res.foo).toBe(2); - expect(res.groupName).toBeDefined(); - expect(res).toMatchSnapshot(); + ]; + const res = upgrades.generateConfig(branchUpgrades); + expect(res.foo).toBe(2); + expect(res.groupName).toBeDefined(); + expect(res).toMatchSnapshot(); + }); }); describe('groupByBranch(upgrades)', () => { it('returns empty object if no input array', async () => {