-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Groups repo+prID pairs by provider to perform the more precise search
(#3788)
- Loading branch information
Showing
12 changed files
with
355 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
src/plus/integrations/providers/__tests__/github.utils.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| import * as assert from 'assert'; | ||
| import { suite, test } from 'mocha'; | ||
| import { getGitHubPullRequestIdentityValuesFromSearch } from '../github.utils'; | ||
|
|
||
| suite('Test GitHub PR URL parsing to identity: getPullRequestIdentityValuesFromSearch()', () => { | ||
| function t(message: string, query: string, prNumber: string | undefined, ownerAndRepo?: string) { | ||
| assert.deepStrictEqual( | ||
| getGitHubPullRequestIdentityValuesFromSearch(query), | ||
| prNumber == null | ||
| ? undefined | ||
| : { | ||
| ownerAndRepo: ownerAndRepo, | ||
| prNumber: prNumber, | ||
| }, | ||
| `${message} (${JSON.stringify(query)})`, | ||
| ); | ||
| } | ||
|
|
||
| test('full URL or without protocol but with domain, should parse to ownerAndRepo and prNumber', () => { | ||
| t('full URL', 'https://github.com/eamodio/vscode-gitlens/pull/1', '1', 'eamodio/vscode-gitlens'); | ||
| t( | ||
| 'with suffix', | ||
| 'https://github.com/eamodio/vscode-gitlens/pull/1/files?diff=unified#hello', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| t( | ||
| 'with query', | ||
| 'https://github.com/eamodio/vscode-gitlens/pull/1?diff=unified#hello', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
|
|
||
| t('with anchor', 'https://github.com/eamodio/vscode-gitlens/pull/1#hello', '1', 'eamodio/vscode-gitlens'); | ||
| t('a weird suffix', 'https://github.com/eamodio/vscode-gitlens/pull/1-files', '1', 'eamodio/vscode-gitlens'); | ||
| t('numeric repo name', 'https://github.com/sergeibbb/1/pull/16', '16', 'sergeibbb/1'); | ||
|
|
||
| t('no protocol with leading slash', '/github.com/sergeibbb/1/pull/16?diff=unified', '16', 'sergeibbb/1'); | ||
| t('no protocol without leading slash', 'github.com/sergeibbb/1/pull/16/files', '16', 'sergeibbb/1'); | ||
| }); | ||
|
|
||
| test('no domain, should parse to ownerAndRepo and prNumber', () => { | ||
| t('with leading slash', '/sergeibbb/1/pull/16#hello', '16', 'sergeibbb/1'); | ||
| t('words in repo name', 'eamodio/vscode-gitlens/pull/1?diff=unified#hello', '1', 'eamodio/vscode-gitlens'); | ||
| t('numeric repo name', 'sergeibbb/1/pull/16/files', '16', 'sergeibbb/1'); | ||
| }); | ||
|
|
||
| test('domain vs. no domain', () => { | ||
| t( | ||
| 'with anchor', | ||
| 'https://github.com/eamodio/vscode-gitlens/pull/1#hello/sergeibbb/1/pull/16', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| }); | ||
|
|
||
| test('numbers', () => { | ||
| t('has "pull/" fragment', '/pull/16/files#hello', '16'); | ||
| t('has "pull/" fragment with double slash', '1//pull/16?diff=unified#hello', '16'); | ||
| t('with leading slash', '/16/files#hello', '16'); | ||
| t('just a number', '16', '16'); | ||
| t('with a hash', '#16', '16'); | ||
| }); | ||
|
|
||
| test('does not match', () => { | ||
| t('without leading slash', '16?diff=unified#hello', undefined); | ||
| t('with leading hash', '/#16/files#hello', undefined); | ||
| t('number is a part of a word', 'hello16', undefined); | ||
| t('number is a part of a word', '16hello', undefined); | ||
|
|
||
| t('GitLab', 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/16', '16'); | ||
|
|
||
| t('with a number', '1/16?diff=unified#hello', '16'); | ||
| t('with a number and slash', '/1/16?diff=unified#hello', '1'); | ||
| t('with a word', 'anything/16?diff=unified#hello', '16'); | ||
|
|
||
| t('with a wrong character leading to pull', 'sergeibbb/1/-pull/16?diff=unified#hello', '1'); | ||
| t('with a wrong character leading to pull', 'sergeibbb/1-pull/16?diff=unified#hello', '1'); | ||
| }); | ||
| }); |
107 changes: 107 additions & 0 deletions
107
src/plus/integrations/providers/__tests__/gitlab.utils.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| import * as assert from 'assert'; | ||
| import { suite, test } from 'mocha'; | ||
| import { getGitLabPullRequestIdentityValuesFromSearch } from '../gitlab.utils'; | ||
|
|
||
| suite('Test GitLab PR URL parsing to identity: getPullRequestIdentityValuesFromSearch()', () => { | ||
| function t(message: string, query: string, prNumber: string | undefined, ownerAndRepo?: string) { | ||
| assert.deepStrictEqual( | ||
| getGitLabPullRequestIdentityValuesFromSearch(query), | ||
| prNumber == null | ||
| ? undefined | ||
| : { | ||
| ownerAndRepo: ownerAndRepo, | ||
| prNumber: prNumber, | ||
| }, | ||
| `${message} (${JSON.stringify(query)})`, | ||
| ); | ||
| } | ||
|
|
||
| test('full URL or without protocol but with domain, should parse to ownerAndRepo and prNumber', () => { | ||
| t('full URL', 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/1', '1', 'eamodio/vscode-gitlens'); | ||
| t( | ||
| 'with suffix', | ||
| 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/1/files?diff=unified#hello', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| t( | ||
| 'with query', | ||
| 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/1?diff=unified#hello', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
|
|
||
| t( | ||
| 'with anchor', | ||
| 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/1#hello', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| t( | ||
| 'a weird suffix', | ||
| 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/1-files', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| t('numeric repo name', 'https://gitlab.com/sergeibbb/1/-/merge_requests/16', '16', 'sergeibbb/1'); | ||
|
|
||
| t( | ||
| 'no protocol with leading slash', | ||
| '/gitlab.com/sergeibbb/1/-/merge_requests/16?diff=unified', | ||
| '16', | ||
| 'sergeibbb/1', | ||
| ); | ||
| t('no protocol without leading slash', 'gitlab.com/sergeibbb/1/-/merge_requests/16/files', '16', 'sergeibbb/1'); | ||
| }); | ||
| test('no domain, should parse to ownerAndRepo and prNumber', () => { | ||
| t('with leading slash', '/sergeibbb/1/-/merge_requests/16#hello', '16', 'sergeibbb/1'); | ||
| t( | ||
| 'words in repo name', | ||
| 'eamodio/vscode-gitlens/-/merge_requests/1?diff=unified#hello', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| t('numeric repo name', 'sergeibbb/1/-/merge_requests/16/files', '16', 'sergeibbb/1'); | ||
| }); | ||
|
|
||
| test('domain vs. no domain', () => { | ||
| t( | ||
| 'with anchor', | ||
| 'https://gitlab.com/eamodio/vscode-gitlens/-/merge_requests/1#hello/sergeibbb/1/-/merge_requests/16', | ||
| '1', | ||
| 'eamodio/vscode-gitlens', | ||
| ); | ||
| }); | ||
|
|
||
| test('numbers', () => { | ||
| t('has "-/merge_requests/" fragment', '/-/merge_requests/16/files#hello', '16'); | ||
| t('has "-/merge_requests/" fragment with double slash', '1//-/merge_requests/16?diff=unified#hello', '16'); | ||
| t('with leading slash', '/16/files#hello', '16'); | ||
| t('just a number', '16', '16'); | ||
| t('with a hash', '#16', '16'); | ||
| }); | ||
|
|
||
| test('does not match', () => { | ||
| t('without leading slash', '16?diff=unified#hello', undefined); | ||
| t('with leading hash', '/#16/files#hello', undefined); | ||
| t('number is a part of a word', 'hello16', undefined); | ||
| t('number is a part of a word', '16hello', undefined); | ||
|
|
||
| t('GitHub', 'https://github.com/eamodio/vscode-gitlens/pull/16', '16'); | ||
|
|
||
| t('with a number', '1/16?diff=unified#hello', '16'); | ||
| t('with a number and slash', '/1/16?diff=unified#hello', '1'); | ||
| t('with a word', 'anything/16?diff=unified#hello', '16'); | ||
|
|
||
| t( | ||
| 'with a wrong character leading to "-/merge_requests/"', | ||
| 'sergeibbb/1/--/merge_requests/16?diff=unified#hello', | ||
| '1', | ||
| ); | ||
| t( | ||
| 'with a wrong character leading to "-/merge_requests/"', | ||
| 'sergeibbb/1--/merge_requests/16?diff=unified#hello', | ||
| '1', | ||
| ); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // GitHub provider: github.ts pulls many dependencies through Container and some of them break the unit tests. | ||
| // That's why this file has been created that can collect more simple functions which | ||
| // don't require Container and can be tested. | ||
|
|
||
| import type { PullRequestURLIdentity } from '../../../git/models/pullRequest.utils'; | ||
| import { getPullRequestIdentityValuesFromSearch } from '../../../git/models/pullRequest.utils'; | ||
|
|
||
| export function getGitHubPullRequestIdentityValuesFromSearch(search: string): PullRequestURLIdentity | undefined { | ||
| let ownerAndRepo: string | undefined = undefined; | ||
| let prNumber: string | undefined = undefined; | ||
|
|
||
| let match = search.match(/([^/]+\/[^/]+)\/(?:pull)\/(\d+)/); // with org and rep name | ||
| if (match != null) { | ||
| ownerAndRepo = match[1]; | ||
| prNumber = match[2]; | ||
| } | ||
|
|
||
| if (prNumber == null) { | ||
| match = search.match(/(?:\/|^)(?:pull)\/(\d+)/); // without repo name | ||
| if (match != null) { | ||
| prNumber = match[1]; | ||
| } | ||
| } | ||
|
|
||
| return prNumber != null | ||
| ? { ownerAndRepo: ownerAndRepo, prNumber: prNumber } | ||
| : getPullRequestIdentityValuesFromSearch(search); | ||
| } |
Oops, something went wrong.