fix: correct PR URL matching

wellcometrust · Dec 12, 2020 · fa75802 · fa75802
1 parent 483aa39
commit fa75802
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/__tests__/helpers.test.ts b/src/__tests__/helpers.test.ts
@@ -32,7 +32,7 @@ test('DependencyExtractor', () => {
 	- Full issue URL:
 		- Depends on https://github.com/another/repo/issues/141
 		- Depends on http://github.com/another/repo/issues/404
-		- Depends on https://github.com/another/repo/pulls/142
+		- Depends on https://github.com/another/repo/pull/142
 	- Crazy formatting:
 		- Depends on ano-ther.999/re_po#123
 	- In brackets:
@@ -49,6 +49,7 @@ test('DependencyExtractor', () => {
 	- Depends on user_repo#123
 	- Depends on this/is/not/repo#123
 	- Depends on #123hashtag
+	- Depends on https://github.com/another/repo/pulls/142
 	`;
 
 	const issue = { body } as Issue;
@@ -82,7 +83,7 @@ test('DependencyExtractor', () => {
 			repo: 'repo',
 			number: 404,
 		},
-		// Depends on https://github.com/another/repo/pulls/142
+		// Depends on https://github.com/another/repo/pull/142
 		{
 			owner: 'another',
 			repo: 'repo',

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -25,7 +25,7 @@ export function formatDependency(dep: Dependency, repo?: Repository) {
 export class DependencyExtractor {
 	private regex: RegExp;
 	private issueRegex = IssueRegex();
-	private urlRegex = /https?:\/\/github\.com\/(?:\w[\w-.]+\/\w[\w-.]+|\B)\/(?:issues|pulls)\/[1-9]\d*\b/;
+	private urlRegex = /https?:\/\/github\.com\/(?:\w[\w-.]+\/\w[\w-.]+|\B)\/(?:issues|pull)\/[1-9]\d*\b/;
 	private keywordRegex: RegExp;
 
 	constructor(private repo: Repository, keywords: string[]) {
@@ -62,7 +62,7 @@ export class DependencyExtractor {
 			// 'owner/repo#number' format
 			return ref
 				.replace(/https?:\/\/github\.com\//i, '')
-				.replace(/\/(issues|pulls)\//i, '#');
+				.replace(/\/(issues|pull)\//i, '#');
 		});
 	}