From f1fba1f746c8295081631e9ae3c96728cb335461 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Tue, 11 Apr 2017 15:17:46 -0400 Subject: [PATCH] user-repo-branch: Ignore `${user}/${repo}/edit/` URLs Example: https://github.com/x0rz/EQGRP/issues/9#issue-220467948 --- lib/user-repo-branch.js | 3 ++- test/user-repo-branch.js | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/user-repo-branch.js b/lib/user-repo-branch.js index c4cb75e..04ea54f 100644 --- a/lib/user-repo-branch.js +++ b/lib/user-repo-branch.js @@ -17,7 +17,7 @@ export default function userRepoBranch (href) { const branch = githubInfo.branch.split('/')[0] // skip false positives like issue/pull urls - if (!href.includes(branch)) { + if (!href.includes(branch) || isIssueUrl(href, user, repo)) { if (branch !== 'master' || isIssueUrl(href, user, repo)) { return { user, repo } } @@ -39,6 +39,7 @@ function isIssueUrl (href, user, repo) { 'commit/', 'search?', 'milestones', + 'edit/', 'releases' ].some(component => href.includes(`${user}/${repo}/${component}`)) } diff --git a/test/user-repo-branch.js b/test/user-repo-branch.js index 542885e..1c1aba2 100644 --- a/test/user-repo-branch.js +++ b/test/user-repo-branch.js @@ -31,3 +31,10 @@ test('https://github.com/mozilla/web-ext/issues?utf8=%E2%9C%93&q=is%3Aclosed%20l repo: 'web-ext' }) }) + +test('https://github.com/x0rz/EQGRP/edit/master/README.md', (t) => { + t.deepEqual(userRepoBranch('https://github.com/x0rz/EQGRP/edit/master/README.md'), { + user: 'x0rz', + repo: 'EQGRP' + }) +})