Fix multiple issue URL parsing

cookpete · Nov 8, 2017 · ddcffe0 · ddcffe0
1 parent 0c5a093
commit ddcffe0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/commits.js b/src/commits.js
@@ -8,7 +8,7 @@ const MATCH_STATS = /(\d+) files? changed(?:, (\d+) insertions?...)?(?:, (\d+) d
 const TAG_PREFIX = 'tag: '
 
 // https://help.github.com/articles/closing-issues-via-commit-messages
-const FIX_PATTERN = /(?:close[sd]?|fixe?[sd]?|resolve[sd]?)\s(?:#(\d+)|(https?:\/\/.+\/issues\/(\d+)))/gi
+const FIX_PATTERN = /(?:close[sd]?|fixe?[sd]?|resolve[sd]?)\s(?:#(\d+)|(https?:\/\/.+?\/issues\/(\d+)))/gi
 
 const MERGE_PATTERNS = [
   /Merge pull request #(\d+) from .+\n\n(.+)/, // Regular GitHub merge

diff --git a/test/commits.js b/test/commits.js
@@ -55,6 +55,14 @@ describe('getFixes', () => {
     ])
   })
 
+  it('parses multiple fixes by issue URL', () => {
+    const message = 'Commit message\n\nFixes https://github.com/user/repo/issues/1 and fixes https://github.com/user/repo/issues/2'
+    expect(getFixes(message, origins.github)).to.deep.equal([
+      { id: '1', href: 'https://github.com/user/repo/issues/1' },
+      { id: '2', href: 'https://github.com/user/repo/issues/2' }
+    ])
+  })
+
   it('parses external repo issues', () => {
     const message = 'Commit message\n\nFixes https://github.com/other-user/external-repo/issues/1'
     expect(getFixes(message, origins.github)).to.deep.equal([