fix: add more branch prefixes to remove

EndemolShineGroup · Nov 2, 2018 · 5444029 · 5444029
1 parent 0b8201f
commit 5444029
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/util.spec.ts b/src/util.spec.ts
@@ -50,8 +50,10 @@ describe('#loadConfig', () => {
 
 describe('#formatGitBranchName', () => {
   it('removes any prefixes from a branch name', () => {
-    const result = formatGitBranchName('feature/123');
-    expect(result).toEqual('#123');
+    expect(formatGitBranchName('feature/123')).toEqual('#123');
+    expect(formatGitBranchName('feat/123')).toEqual('#123');
+    expect(formatGitBranchName('hotfix/456')).toEqual('#456');
+    expect(formatGitBranchName('fix/456')).toEqual('#456');
   });
 
   it('handles running on Travis CI when Git is not initialised', () => {

diff --git a/src/util.ts b/src/util.ts
@@ -30,10 +30,10 @@ export function findLongest(strings: string[]): number {
 }
 
 export function formatGitBranchName(branchName: string) {
-  const issueId = (branchName || '')
-    .replace('feature/', '') // Get rid of `feature/` prefix
-    .replace('fix/', '') // Get rid of `fix/` prefix
-    .toLocaleUpperCase(); // Uppercase issue IDs
+  const issueId = (branchName || '').replace(
+    /^(feature|feat|hotfix|fix)\//,
+    '',
+  );
 
   return issueId ? `#${issueId}` : '';
 }