fix: Incorrect Github Regex (#86)

target · Oct 20, 2020 · 87ce12b · 87ce12b
1 parent 8e093f7
commit 87ce12b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/src/utils/ticketFinder/finders/github/__tests__/githubFinder.test.js b/src/utils/ticketFinder/finders/github/__tests__/githubFinder.test.js
@@ -128,6 +128,57 @@ describe('github finder', () => {
     expect(githubFinder({ body })).toEqual(expectation);
   });
 
+  it('should return 2 tickets, not one, if they grouped together by only words or whitespace', () => {
+    const PRBody = `
+      ## Summary
+
+
+      https://git.you.com/wow/woohoo/issues/27158 and https://git.you.com/wow/woohoo/issue/27166
+
+      ### Addresses issue
+
+      prod issue
+      ### Steps to reproduce & screenshots/GIFs
+    `;
+    const expectation = {
+      tickets: [
+        {
+          fullLinkedUrl: 'https://git.you.com/wow/woohoo/issues/27158',
+          project: 'wow/woohoo',
+          issueNumber: '27158',
+          name: '27158',
+        },
+        {
+          fullLinkedUrl: 'https://git.you.com/wow/woohoo/issue/27166',
+          project: 'wow/woohoo',
+          issueNumber: '27166',
+          name: '27166',
+        },
+      ],
+      name: 'github',
+    };
+
+    expect(githubFinder({ body: PRBody })).toEqual(expectation);
+  });
+
+  it('should return no tickets if there are only pull request', () => {
+    const PRBody = `
+      ## Summary
+
+
+      https://git.you.com/wow/woohoo/pull/27158 and https://git.you.com/wow/woohoo/pull/27166
+      ### Addresses issue
+
+      prod issue
+      ### Steps to reproduce & screenshots/GIFs
+    `;
+    const expectation = {
+      tickets: [],
+      name: 'github',
+    };
+    expect(githubFinder({ body: PRBody })).toEqual(expectation);
+  });
+
   it('should return no tickets if there are no ticket types', () => {
     const expectation = {
       tickets: [],

diff --git a/src/utils/ticketFinder/finders/github/index.js b/src/utils/ticketFinder/finders/github/index.js
@@ -7,7 +7,7 @@ const githubDomain = config.get('github:domain') || 'https://github.com';
 const owner = config.get('github:owner');
 const repo = config.get('github:repo');
 
-const GITHUB_QUALIFIED_URL = /(https:\/\/(?:www.git|git).*\..+\/\d+)/;
+const GITHUB_QUALIFIED_URL = /(https:\/\/(?:www.git|git)(?:\.\w+|\w+)\.com\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+\/[^pull]+\w+\/\d+)/;
 const GITHUB_QUALIFIED_NUMBER_URL = /https:\/\/(?:www.git|git).*\..+\/(\d+)/;
 const CLOSE_ISSUE_SYNTAX = /(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s(\S.*\/\S.*#\d+|#\d+)/;
 const CLOSE_SYNTAX_NUMBER = /#(\d+)/;