[bug fix] tagName being ignored (#634)

release-it · Mar 31, 2020 · 413068e · 413068e
1 parent 0833082
commit 413068e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/plugin/GitBase.js b/lib/plugin/GitBase.js
@@ -15,7 +15,7 @@ class GitBase extends Plugin {
     await this.fetch();
     const repo = parseGitUrl(this.remoteUrl);
     const latestTagName = await this.getLatestTagName();
-    const tagName = this.options.tagName || (latestTagName || '').match(/^v/) ? 'v${version}' : '${version}';
+    const tagName = this.options.tagName || ((latestTagName || '').match(/^v/) ? 'v${version}' : '${version}');
     const changelog = await this.getChangelog(latestTagName);
     this.setContext({ repo, latestTagName, tagName, changelog });
   }

diff --git a/test/git.init.js b/test/git.init.js
@@ -99,6 +99,14 @@ test.serial('should detect include version prefix (without "v")', async t => {
   t.is(gitClient.getContext('tagName'), '1.0.1');
 });
 
+test.serial('should honor tagName configuration', async t => {
+  const gitClient = factory(Git, { options: { git: { tagName: 'TAGNAME-v${version}' } } });
+  sh.exec('git tag 1.0.0');
+  await gitClient.init();
+  await gitClient.bump('1.0.1');
+  t.is(gitClient.getContext('tagName'), 'TAGNAME-v1.0.1');
+});
+
 test.serial('should detect include version prefix (configured)', async t => {
   const gitClient = factory(Git, { options: { git: { tagName: 'v${version}' } } });
   sh.exec('git tag 1.0.0');