Fixes unit tests by uncoupling dependencies

(#3621)

src/git/models/__tests__/pullRequest.test.ts → src/git/models/__tests__/pullRequest.utils.test.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import { suite, test } from 'mocha';
-import { getPullRequestIdentityValuesFromSearch } from '../pullRequest';
+import { getPullRequestIdentityValuesFromSearch } from '../pullRequest.utils';
 
 suite('Test GitHub PR URL parsing to identity: getPullRequestIdentityValuesFromSearch()', () => {
 	function t(message: string, query: string, prNumber: string | undefined, ownerAndRepo?: string) {

src/git/models/pullRequest.ts

@@ -7,6 +7,7 @@ import { formatDate, fromNow } from '../../system/date';
 import { memoize } from '../../system/decorators/memoize';
 import type { LeftRightCommitCountResult } from '../gitProvider';
 import type { IssueOrPullRequest, IssueRepository, IssueOrPullRequestState as PullRequestState } from './issue';
+import type { PullRequestURLIdentity } from './pullRequest.utils';
 import { createRevisionRange, shortenRevision } from './reference';
 import type { ProviderReference } from './remoteProvider';
 import type { Repository } from './repository';
@@ -417,45 +418,6 @@ export async function getOpenedPullRequestRepo(
 	return repo;
 }
 
-export type PullRequestURLIdentity = {
-	ownerAndRepo?: string;
-	prNumber?: string;
-};
-
-export function getPullRequestIdentityValuesFromSearch(search: string): PullRequestURLIdentity {
-	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];
-		}
-	}
-
-	if (prNumber == null) {
-		match = search.match(/(?:\/)(\d+)/); // any number starting with "/"
-		if (match != null) {
-			prNumber = match[1];
-		}
-	}
-
-	if (prNumber == null) {
-		match = search.match(/^#?(\d+)$/); // just a number or with a leading "#"
-		if (match != null) {
-			prNumber = match[1];
-		}
-	}
-
-	return { ownerAndRepo: ownerAndRepo, prNumber: prNumber };
-}
-
 export function doesPullRequestSatisfyRepositoryURLIdentity(
 	pr: EnrichablePullRequest | undefined,
 	{ ownerAndRepo, prNumber }: PullRequestURLIdentity,

src/git/models/pullRequest.utils.ts

@@ -0,0 +1,42 @@
+// pullRequest.ts pulls many dependencies through Container and some of them break the unit tests.
+// To avoid this file has been created that can collect more simple functions which
+// don't require Container and can be tested.
+
+export type PullRequestURLIdentity = {
+	ownerAndRepo?: string;
+	prNumber?: string;
+};
+
+export function getPullRequestIdentityValuesFromSearch(search: string): PullRequestURLIdentity {
+	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];
+		}
+	}
+
+	if (prNumber == null) {
+		match = search.match(/(?:\/)(\d+)/); // any number starting with "/"
+		if (match != null) {
+			prNumber = match[1];
+		}
+	}
+
+	if (prNumber == null) {
+		match = search.match(/^#?(\d+)$/); // just a number or with a leading "#"
+		if (match != null) {
+			prNumber = match[1];
+		}
+	}
+
+	return { ownerAndRepo: ownerAndRepo, prNumber: prNumber };
+}

src/plus/launchpad/launchpad.ts

@@ -42,10 +42,8 @@ import { HostingIntegrationId, SelfHostedIntegrationId } from '../../constants.i
 import type { LaunchpadTelemetryContext, Source, Sources, TelemetryEvents } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import { PlusFeatures } from '../../features';
-import {
-	doesPullRequestSatisfyRepositoryURLIdentity,
-	getPullRequestIdentityValuesFromSearch,
-} from '../../git/models/pullRequest';
+import { doesPullRequestSatisfyRepositoryURLIdentity } from '../../git/models/pullRequest';
+import { getPullRequestIdentityValuesFromSearch } from '../../git/models/pullRequest.utils';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import { createQuickPickItemOfT, createQuickPickSeparator } from '../../quickpicks/items/common';
 import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive';

src/plus/launchpad/launchpadProvider.ts

@@ -19,9 +19,9 @@ import type { PullRequest, SearchedPullRequest } from '../../git/models/pullRequ
 import {
 	getComparisonRefsForPullRequest,
 	getOrOpenPullRequestRepository,
-	getPullRequestIdentityValuesFromSearch,
 	getRepositoryIdentityForPullRequest,
 } from '../../git/models/pullRequest';
+import { getPullRequestIdentityValuesFromSearch } from '../../git/models/pullRequest.utils';
 import type { GitRemote } from '../../git/models/remote';
 import type { Repository } from '../../git/models/repository';
 import type { CodeSuggestionCounts, Draft } from '../../gk/models/drafts';