fix(bump): propagate the parserOpts from args to conventionalRecommen…

…dedBump, 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
absolute-version · Aug 22, 2023 · bc685be · bc685be
1 parent 9ed2207
commit bc685be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/lifecycles/bump.js b/lib/lifecycles/bump.js
@@ -124,7 +124,7 @@ function bumpVersion (releaseAs, currentVersion, args) {
         path: args.path,
         tagPrefix: args.tagPrefix,
         lernaPackage: args.lernaPackage
-      }, function (err, release) {
+      }, args.parserOpts, function (err, release) {
         if (err) return reject(err)
         else return resolve(release)
       })

diff --git a/test/config-files.spec.js b/test/config-files.spec.js
@@ -22,15 +22,15 @@ function exec () {
  *
  * Mocks should be unregistered in test cleanup by calling unmock()
  *
- * bump?: 'major' | 'minor' | 'patch' | Error | (opt, cb) => { cb(err) | cb(null, { releaseType }) }
+ * bump?: 'major' | 'minor' | 'patch' | Error | (opt, parserOpts, cb) => { cb(err) | cb(null, { releaseType }) }
  * changelog?: string | Error | Array<string | Error | (opt) => string | null>
  * tags?: string[] | Error
  */
 function mock ({ bump, changelog, tags } = {}) {
   mockery.enable({ warnOnUnregistered: false, useCleanCache: true })
 
-  mockery.registerMock('conventional-recommended-bump', function (opt, cb) {
-    if (typeof bump === 'function') bump(opt, cb)
+  mockery.registerMock('conventional-recommended-bump', function (opt, parserOpts, cb) {
+    if (typeof bump === 'function') bump(opt, parserOpts, cb)
     else if (bump instanceof Error) cb(bump)
     else cb(null, bump ? { releaseType: bump } : {})
   })

diff --git a/test/core.spec.js b/test/core.spec.js
@@ -36,7 +36,7 @@ function getPackageVersion () {
  *
  * Mocks should be unregistered in test cleanup by calling unmock()
  *
- * bump?: 'major' | 'minor' | 'patch' | Error | (opt, cb) => { cb(err) | cb(null, { releaseType }) }
+ * bump?: 'major' | 'minor' | 'patch' | Error | (opt, parserOpts, cb) => { cb(err) | cb(null, { releaseType }) }
  * changelog?: string | Error | Array<string | Error | (opt) => string | null>
  * execFile?: ({ dryRun, silent }, cmd, cmdArgs) => Promise<string>
  * fs?: { [string]: string | Buffer | any }
@@ -46,8 +46,8 @@ function getPackageVersion () {
 function mock ({ bump, changelog, execFile, fs, pkg, tags } = {}) {
   mockery.enable({ warnOnUnregistered: false, useCleanCache: true })
 
-  mockery.registerMock('conventional-recommended-bump', function (opt, cb) {
-    if (typeof bump === 'function') bump(opt, cb)
+  mockery.registerMock('conventional-recommended-bump', function (opt, parserOpts, cb) {
+    if (typeof bump === 'function') bump(opt, parserOpts, cb)
     else if (bump instanceof Error) cb(bump)
     else cb(null, bump ? { releaseType: bump } : {})
   })
@@ -405,7 +405,7 @@ describe('cli', function () {
 
     it('creates a prerelease with a new minor version after two prerelease patches', async function () {
       let releaseType = 'patch'
-      const bump = (_, cb) => cb(null, { releaseType })
+      const bump = (_, __, cb) => cb(null, { releaseType })
       mock({
         bump,
         fs: { 'CHANGELOG.md': 'legacy header format<a name="1.0.0">\n' }

diff --git a/test/git.spec.js b/test/git.spec.js
@@ -38,16 +38,16 @@ function getPackageVersion () {
 /**
  * Mock external conventional-changelog modules
  *
- * bump: 'major' | 'minor' | 'patch' | Error | (opt, cb) => { cb(err) | cb(null, { releaseType }) }
+ * bump: 'major' | 'minor' | 'patch' | Error | (opt, parserOpts, cb) => { cb(err) | cb(null, { releaseType }) }
  * changelog?: string | Error | Array<string | Error | (opt) => string | null>
  * tags?: string[] | Error
  */
 function mock ({ bump, changelog, tags }) {
   if (bump === undefined) throw new Error('bump must be defined for mock()')
   mockery.enable({ warnOnUnregistered: false, useCleanCache: true })
 
-  mockery.registerMock('conventional-recommended-bump', function (opt, cb) {
-    if (typeof bump === 'function') bump(opt, cb)
+  mockery.registerMock('conventional-recommended-bump', function (opt, parserOpts, cb) {
+    if (typeof bump === 'function') bump(opt, parserOpts, cb)
     else if (bump instanceof Error) cb(bump)
     else cb(null, { releaseType: bump })
   })