Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/test/github/externalUriOpener.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { default as assert } from 'assert';
import { createSandbox, SinonSandbox } from 'sinon';
import * as vscode from 'vscode';
import { RemoteOnlyRepository } from '../../api/remoteOnlyRepository';
import { OPEN_PULL_LINKS, PR_SETTINGS_NAMESPACE } from '../../common/settingKeys';
import { CredentialStore } from '../../github/credentials';
import { registerGitHubIssueOrPullRequestExternalUriOpener } from '../../github/externalUriOpener';
import { FolderRepositoryManager } from '../../github/folderRepositoryManager';
Expand All @@ -33,8 +32,6 @@ describe('GitHubIssueOrPullRequestExternalUriOpener', () => {
const credentialStore = new CredentialStore(telemetry, context);
const repositoriesManager = new RepositoriesManager(credentialStore, telemetry);
const folderRepositoryManagerResolver = new FolderRepositoryManagerResolver(context, repositoriesManager, telemetry);
const configuration = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE);
const previousSettingValue = configuration.inspect<boolean>(OPEN_PULL_LINKS)?.globalValue;
let opener: vscode.ExternalUriOpener | undefined;
let registration: vscode.Disposable | undefined;
let cancellation: vscode.CancellationTokenSource | undefined;
Expand All @@ -47,16 +44,15 @@ describe('GitHubIssueOrPullRequestExternalUriOpener', () => {
return undefined;
});
const openExternal = sandbox.stub(vscode.env, 'openExternal').resolves(true);

try {
await configuration.update(OPEN_PULL_LINKS, true, vscode.ConfigurationTarget.Global);
registration = registerGitHubIssueOrPullRequestExternalUriOpener(
context,
folderRepositoryManagerResolver,
telemetry,
);
const uri = vscode.Uri.parse('https://github.com/microsoft/vscode/issues/1');
assert.ok(opener);
sandbox.stub(opener as any, 'isOpenPullLinksEnabled').returns(true);
cancellation = new vscode.CancellationTokenSource();
await opener.openExternalUri(uri, { sourceUri: uri }, cancellation.token);

Expand Down Expand Up @@ -110,7 +106,6 @@ describe('GitHubIssueOrPullRequestExternalUriOpener', () => {
} finally {
cancellation?.dispose();
registration?.dispose();
await configuration.update(OPEN_PULL_LINKS, previousSettingValue, vscode.ConfigurationTarget.Global);
folderRepositoryManagerResolver.dispose();
repositoriesManager.dispose();
credentialStore.dispose();
Expand Down