Skip to content

Commit bc685be

Browse files
authored
fix(bump): propagate the parserOpts from args to conventionalRecommendedBump, fixing an issue with custom headerPatterns (#89)
* chore(bump): also propagate the parserOpts from args to conventionalRecommendedBump * chore(tests): add the third possible parameter for the bump function to the mocking for tests
1 parent 9ed2207 commit bc685be

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

lib/lifecycles/bump.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function bumpVersion (releaseAs, currentVersion, args) {
124124
path: args.path,
125125
tagPrefix: args.tagPrefix,
126126
lernaPackage: args.lernaPackage
127-
}, function (err, release) {
127+
}, args.parserOpts, function (err, release) {
128128
if (err) return reject(err)
129129
else return resolve(release)
130130
})

test/config-files.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ function exec () {
2222
*
2323
* Mocks should be unregistered in test cleanup by calling unmock()
2424
*
25-
* bump?: 'major' | 'minor' | 'patch' | Error | (opt, cb) => { cb(err) | cb(null, { releaseType }) }
25+
* bump?: 'major' | 'minor' | 'patch' | Error | (opt, parserOpts, cb) => { cb(err) | cb(null, { releaseType }) }
2626
* changelog?: string | Error | Array<string | Error | (opt) => string | null>
2727
* tags?: string[] | Error
2828
*/
2929
function mock ({ bump, changelog, tags } = {}) {
3030
mockery.enable({ warnOnUnregistered: false, useCleanCache: true })
3131

32-
mockery.registerMock('conventional-recommended-bump', function (opt, cb) {
33-
if (typeof bump === 'function') bump(opt, cb)
32+
mockery.registerMock('conventional-recommended-bump', function (opt, parserOpts, cb) {
33+
if (typeof bump === 'function') bump(opt, parserOpts, cb)
3434
else if (bump instanceof Error) cb(bump)
3535
else cb(null, bump ? { releaseType: bump } : {})
3636
})

test/core.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function getPackageVersion () {
3636
*
3737
* Mocks should be unregistered in test cleanup by calling unmock()
3838
*
39-
* bump?: 'major' | 'minor' | 'patch' | Error | (opt, cb) => { cb(err) | cb(null, { releaseType }) }
39+
* bump?: 'major' | 'minor' | 'patch' | Error | (opt, parserOpts, cb) => { cb(err) | cb(null, { releaseType }) }
4040
* changelog?: string | Error | Array<string | Error | (opt) => string | null>
4141
* execFile?: ({ dryRun, silent }, cmd, cmdArgs) => Promise<string>
4242
* fs?: { [string]: string | Buffer | any }
@@ -46,8 +46,8 @@ function getPackageVersion () {
4646
function mock ({ bump, changelog, execFile, fs, pkg, tags } = {}) {
4747
mockery.enable({ warnOnUnregistered: false, useCleanCache: true })
4848

49-
mockery.registerMock('conventional-recommended-bump', function (opt, cb) {
50-
if (typeof bump === 'function') bump(opt, cb)
49+
mockery.registerMock('conventional-recommended-bump', function (opt, parserOpts, cb) {
50+
if (typeof bump === 'function') bump(opt, parserOpts, cb)
5151
else if (bump instanceof Error) cb(bump)
5252
else cb(null, bump ? { releaseType: bump } : {})
5353
})
@@ -405,7 +405,7 @@ describe('cli', function () {
405405

406406
it('creates a prerelease with a new minor version after two prerelease patches', async function () {
407407
let releaseType = 'patch'
408-
const bump = (_, cb) => cb(null, { releaseType })
408+
const bump = (_, __, cb) => cb(null, { releaseType })
409409
mock({
410410
bump,
411411
fs: { 'CHANGELOG.md': 'legacy header format<a name="1.0.0">\n' }

test/git.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ function getPackageVersion () {
3838
/**
3939
* Mock external conventional-changelog modules
4040
*
41-
* bump: 'major' | 'minor' | 'patch' | Error | (opt, cb) => { cb(err) | cb(null, { releaseType }) }
41+
* bump: 'major' | 'minor' | 'patch' | Error | (opt, parserOpts, cb) => { cb(err) | cb(null, { releaseType }) }
4242
* changelog?: string | Error | Array<string | Error | (opt) => string | null>
4343
* tags?: string[] | Error
4444
*/
4545
function mock ({ bump, changelog, tags }) {
4646
if (bump === undefined) throw new Error('bump must be defined for mock()')
4747
mockery.enable({ warnOnUnregistered: false, useCleanCache: true })
4848

49-
mockery.registerMock('conventional-recommended-bump', function (opt, cb) {
50-
if (typeof bump === 'function') bump(opt, cb)
49+
mockery.registerMock('conventional-recommended-bump', function (opt, parserOpts, cb) {
50+
if (typeof bump === 'function') bump(opt, parserOpts, cb)
5151
else if (bump instanceof Error) cb(bump)
5252
else cb(null, { releaseType: bump })
5353
})

0 commit comments

Comments
 (0)