)})
`
- * ```
- */
- asWebviewUri(localResource: Uri): Uri;
-}
-
-// Wraps the VS Code webview panel
-export const IWebviewPanel = Symbol('IWebviewPanel');
-export interface IWebviewPanel extends IWebview {
- /**
- * Event is fired when the load for a web panel fails
- */
- readonly loadFailed: EventCreate New Blank Notebook
" in the Command Palette (Shift + Command + P
)- Explore our
sample notebook
to learn about notebook features',
- );
- export const createAPythonFile = localize('StartPage.createAPythonFile', 'Create a Python File');
- export const pythonFileDescription = localize(
- 'StartPage.pythonFileDescription',
- '- Create a new file
with a .py extension',
- );
- export const openInteractiveWindow = localize(
- 'StartPage.openInteractiveWindow',
- 'Use the Interactive Window to develop Python Scripts',
- );
- export const interactiveWindowDesc = localize(
- 'StartPage.interactiveWindowDesc',
- '- You can create cells on a Python file by typing "#%%". Make sure you have the Jupyter extension installed. - Use "
Shift + Enter
" to run a cell, the output will be shown in the interactive window',
- );
-
- export const releaseNotes = localize(
- 'StartPage.releaseNotes',
- 'Take a look at our Release Notes to learn more about the latest features.',
- );
- export const tutorialAndDoc = localize(
- 'StartPage.tutorialAndDoc',
- 'Explore more features in our Tutorials or check Documentation for tips and troubleshooting.',
- );
- export const mailingList = localize(
- 'StartPage.mailingList',
- 'Sign up for tips and tutorials through our mailing list.',
- );
- export const dontShowAgain = localize('StartPage.dontShowAgain', "Don't show this page again");
- export const helloWorld = localize('StartPage.helloWorld', 'Hello world');
- // When localizing sampleNotebook, the translated notebook must also be included in
- // pythonFiles\*
- export const sampleNotebook = localize('StartPage.sampleNotebook', 'Notebooks intro');
- export const openFolder = localize('StartPage.openFolder', 'Open a Folder or Workspace');
- export const folderDesc = localize(
- 'StartPage.folderDesc',
- '- Open a Folder
- Open a
Workspace
',
- );
- export const badWebPanelFormatString = localize(
- 'StartPage.badWebPanelFormatString',
- '{0} is not a valid file name
', - ); -} - export namespace DebugConfigStrings { export const selectConfiguration = { title: localize('debug.selectConfigurationTitle'), diff --git a/src/client/extensionActivation.ts b/src/client/extensionActivation.ts index f45440645879..b7bb614ded18 100644 --- a/src/client/extensionActivation.ts +++ b/src/client/extensionActivation.ts @@ -15,8 +15,6 @@ import { Commands, PYTHON, PYTHON_LANGUAGE, STANDARD_OUTPUT_CHANNEL, UseProposed import { registerTypes as installerRegisterTypes } from './common/installer/serviceRegistry'; import { traceError } from './common/logger'; import { IFileSystem } from './common/platform/types'; -import { StartPage } from './common/startPage/startPage'; -import { IStartPage } from './common/startPage/types'; import { IConfigurationService, IDisposableRegistry, @@ -152,8 +150,6 @@ async function activateLegacy(ext: ExtensionState): Promise
-
- );
- }
-
- // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
- public handleMessage = (msg: string, payload?: any): boolean => {
- switch (msg) {
- case StartPageMessages.SendSetting:
- this.releaseNotes.showAgainSetting = payload.showAgainSetting;
- this.setState({});
- break;
-
- case SharedMessages.LocInit:
- {
- // Initialize localization.
- const locJSON = JSON.parse(payload);
- storeLocStrings(locJSON);
- }
- break;
-
- default:
- break;
- }
-
- return false;
- };
-
- public openFileBrowser(): void {
- this.postOffice.sendMessage
-
-
-
- {getLocString('StartPage.pythonExtensionTitle', 'Python Extension')}
-
-
-
-
-
-
-
- {getLocString('StartPage.createJupyterNotebook', 'Create a Jupyter Notebook')}
-
- {this.renderNotebookDescription()}
-
-
-
-
-
-
-
- {getLocString('StartPage.createAPythonFile', 'Create a Python File')}
-
- {this.renderPythonFileDescription()}
-
-
-
-
-
-
-
- {getLocString('StartPage.openFolder', 'Open a Folder or Workspace')}
-
- {this.renderFolderDescription()}
-
-
-
-
-
-
-
- {getLocString(
- 'StartPage.openInteractiveWindow',
- 'Use the Interactive Window to develop Python Scripts',
- )}
-
- {this.renderInteractiveWindowDescription()}
-
- {this.renderReleaseNotesLink()}
- {this.renderTutorialAndDoc()}
- {this.renderMailingList()}
-
-
-
-
-
-
- {getLocString('StartPage.dontShowAgain', "Don't show this page again")}
-Create New Blank Notebook
" in the Command Palette (Shift + Command + P
)- Explore our
sample notebook
to learn about notebook features',
- ).format('openCommandPaletteWithSelection()', 'openSampleNotebook()'),
- }}
- />
- );
- }
-
- // eslint-disable-next-line class-methods-use-this
- private renderPythonFileDescription(): JSX.Element {
- return (
- new file
with a .py extension',
- ).format('createPythonFile()'),
- }}
- />
- );
- }
-
- // eslint-disable-next-line class-methods-use-this
- private renderInteractiveWindowDescription(): JSX.Element {
- return (
- - Use "Shift + Enter
" to run a cell, the output will be shown in the interactive window',
- ),
- }}
- />
- );
- }
-
- // eslint-disable-next-line class-methods-use-this
- private renderFolderDescription(): JSX.Element {
- return (
- Folder
- Open a
Workspace
',
- ).format('openFolder()', 'openWorkspace()'),
- }}
- />
- );
- }
-
- // eslint-disable-next-line class-methods-use-this
- private renderReleaseNotesLink(): JSX.Element {
- return (
- Release Notes to learn more about the latest features.',
- ).format('https://aka.ms/AA8dxtb'),
- }}
- />
- );
- }
-
- // eslint-disable-next-line class-methods-use-this
- private renderTutorialAndDoc(): JSX.Element {
- return (
-
Tutorials or check Documentation for tips and troubleshooting.',
- ).format('https://aka.ms/AA8dqti', 'https://aka.ms/AA8dxwy'),
- }}
- />
- );
- }
-
- // eslint-disable-next-line class-methods-use-this
- private renderMailingList(): JSX.Element {
- return (
-
Sign up for tips and tutorials through our mailing list.',
- ).format('https://aka.ms/AAbopxr'),
- }}
- />
- );
- }
-
- private openBlankNotebook = (): void => {
- this.postOffice.sendMessage(StartPageMessages.OpenBlankNotebook);
- };
-
- private createPythonFile = (): void => {
- this.postOffice.sendMessage(StartPageMessages.OpenBlankPythonFile);
- };
-
- private openCommandPalette = (): void => {
- this.postOffice.sendMessage(StartPageMessages.OpenCommandPalette);
- };
-
- private openCommandPaletteWithSelection = (): void => {
- this.postOffice.sendMessage(StartPageMessages.OpenCommandPaletteWithOpenNBSelected);
- };
-
- private openSampleNotebook = (): void => {
- this.postOffice.sendMessage(StartPageMessages.OpenSampleNotebook);
- };
-
- private openInteractiveWindow = (): void => {
- this.postOffice.sendMessage(StartPageMessages.OpenInteractiveWindow);
- };
-
- private updateSettings = (): void => {
- this.releaseNotes.showAgainSetting = !this.releaseNotes.showAgainSetting;
- this.postOffice.sendMessage(
- StartPageMessages.UpdateSettings,
- this.releaseNotes.showAgainSetting,
- );
- };
-}
diff --git a/src/test/application/diagnostics/checks/pylanceDefault.unit.test.ts b/src/test/application/diagnostics/checks/pylanceDefault.unit.test.ts
index 518f46a023f0..9fe4863db483 100644
--- a/src/test/application/diagnostics/checks/pylanceDefault.unit.test.ts
+++ b/src/test/application/diagnostics/checks/pylanceDefault.unit.test.ts
@@ -19,19 +19,16 @@ import {
IDiagnostic,
IDiagnosticFilterService,
IDiagnosticHandlerService,
- IDiagnosticsService,
} from '../../../../client/application/diagnostics/types';
-import { IStartPage } from '../../../../client/common/startPage/types';
import { IExtensionContext } from '../../../../client/common/types';
import { Common, Diagnostics } from '../../../../client/common/utils/localize';
import { IServiceContainer } from '../../../../client/ioc/types';
suite('Application Diagnostics - Pylance informational prompt', () => {
let serviceContainer: typemoq.IMock;
- let diagnosticService: IDiagnosticsService;
+ let diagnosticService: PylanceDefaultDiagnosticService;
let filterService: typemoq.IMock;
let messageHandler: typemoq.IMock>;
- let startPage: typemoq.IMock;
let context: typemoq.IMock;
let memento: typemoq.IMock;
@@ -39,7 +36,6 @@ suite('Application Diagnostics - Pylance informational prompt', () => {
serviceContainer = typemoq.Mock.ofType();
filterService = typemoq.Mock.ofType();
messageHandler = typemoq.Mock.ofType>();
- startPage = typemoq.Mock.ofType();
context = typemoq.Mock.ofType();
memento = typemoq.Mock.ofType();
@@ -55,7 +51,7 @@ suite('Application Diagnostics - Pylance informational prompt', () => {
BaseDiagnosticsService.handledDiagnosticCodeKeys.shift();
}
}
- })(serviceContainer.object, context.object, startPage.object, messageHandler.object, []);
+ })(serviceContainer.object, context.object, messageHandler.object, []);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(diagnosticService as any)._clear();
});
@@ -66,7 +62,7 @@ suite('Application Diagnostics - Pylance informational prompt', () => {
});
function setupMementos(version?: string, promptShown?: boolean) {
- startPage.setup((s) => s.initialMementoValue).returns(() => version);
+ diagnosticService.initialMementoValue = version;
memento.setup((m) => m.get(PYLANCE_PROMPT_MEMENTO)).returns(() => promptShown);
}
diff --git a/src/test/common/application/commands/reportIssueCommand.unit.test.ts b/src/test/common/application/commands/reportIssueCommand.unit.test.ts
index 337e518e0268..524afb34488d 100644
--- a/src/test/common/application/commands/reportIssueCommand.unit.test.ts
+++ b/src/test/common/application/commands/reportIssueCommand.unit.test.ts
@@ -17,7 +17,7 @@ import { IInterpreterService, IInterpreterVersionService } from '../../../../cli
import { InterpreterVersionService } from '../../../../client/interpreter/interpreterVersion';
import { PythonEnvKind } from '../../../../client/pythonEnvironments/base/info';
import * as EnvIdentifier from '../../../../client/pythonEnvironments/common/environmentIdentifier';
-import { MockWorkspaceConfiguration } from '../../../startPage/mockWorkspaceConfig';
+import { MockWorkspaceConfiguration } from '../../../mocks/mockWorkspaceConfig';
import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../../constants';
import { InterpreterService } from '../../../../client/interpreter/interpreterService';
import * as Logging from '../../../../client/logging/_global';
diff --git a/src/test/common/installer/installer.unit.test.ts b/src/test/common/installer/installer.unit.test.ts
index 3610f467b51e..38f002c028f2 100644
--- a/src/test/common/installer/installer.unit.test.ts
+++ b/src/test/common/installer/installer.unit.test.ts
@@ -63,7 +63,7 @@ import { LinterManager } from '../../../client/linters/linterManager';
import { ILinterManager } from '../../../client/linters/types';
import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
import { sleep } from '../../common';
-import { MockWorkspaceConfiguration } from '../../startPage/mockWorkspaceConfig';
+import { MockWorkspaceConfiguration } from '../../mocks/mockWorkspaceConfig';
use(chaiAsPromised);
diff --git a/src/test/common/installer/serviceRegistry.unit.test.ts b/src/test/common/installer/serviceRegistry.unit.test.ts
index 2cc02576e290..fdd2550a611b 100644
--- a/src/test/common/installer/serviceRegistry.unit.test.ts
+++ b/src/test/common/installer/serviceRegistry.unit.test.ts
@@ -4,8 +4,6 @@
'use strict';
import { instance, mock, verify } from 'ts-mockito';
-import { IWebviewPanelProvider } from '../../../client/common/application/types';
-import { WebviewPanelProvider } from '../../../client/common/application/webviewPanels/webviewPanelProvider';
import { InstallationChannelManager } from '../../../client/common/installer/channelManager';
import { CondaInstaller } from '../../../client/common/installer/condaInstaller';
import { InsidersBuildInstaller, StableBuildInstaller } from '../../../client/common/installer/extensionBuildInstaller';
@@ -104,6 +102,5 @@ suite('Common installer Service Registry', () => {
ProductType.RefactoringLibrary,
),
).once();
- verify(serviceManager.addSingleton(IWebviewPanelProvider, WebviewPanelProvider)).once();
});
});
diff --git a/src/test/common/moduleInstaller.test.ts b/src/test/common/moduleInstaller.test.ts
index 38967b97b226..832003031c8c 100644
--- a/src/test/common/moduleInstaller.test.ts
+++ b/src/test/common/moduleInstaller.test.ts
@@ -131,8 +131,6 @@ import { MockModuleInstaller } from '../mocks/moduleInstaller';
import { MockProcessService } from '../mocks/proc';
import { UnitTestIocContainer } from '../testing/serviceRegistry';
import { closeActiveWindows, initializeTest } from '../initialize';
-import { JupyterNotInstalledNotificationHelper } from '../../client/jupyter/jupyterNotInstalledNotificationHelper';
-import { IJupyterNotInstalledNotificationHelper } from '../../client/jupyter/types';
chaiUse(chaiAsPromised);
@@ -242,10 +240,6 @@ suite('Module Installer', () => {
IJupyterExtensionDependencyManager,
JupyterExtensionDependencyManager,
);
- ioc.serviceManager.addSingleton(
- IJupyterNotInstalledNotificationHelper,
- JupyterNotInstalledNotificationHelper,
- );
ioc.serviceManager.addSingleton(IBrowserService, BrowserService);
ioc.serviceManager.addSingleton(IHttpClient, HttpClient);
ioc.serviceManager.addSingleton(IFileDownloader, FileDownloader);
diff --git a/src/test/jupyter/jupyterNotInstalledNotificationHelper.unit.test.ts b/src/test/jupyter/jupyterNotInstalledNotificationHelper.unit.test.ts
deleted file mode 100644
index 616793e04c8b..000000000000
--- a/src/test/jupyter/jupyterNotInstalledNotificationHelper.unit.test.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import * as assert from 'assert';
-import * as sinon from 'sinon';
-import { IApplicationShell, IJupyterExtensionDependencyManager } from '../../client/common/application/types';
-import { IPersistentStateFactory } from '../../client/common/types';
-import { Jupyter, Common } from '../../client/common/utils/localize';
-import {
- jupyterExtensionNotInstalledKey,
- JupyterNotInstalledNotificationHelper,
-} from '../../client/jupyter/jupyterNotInstalledNotificationHelper';
-import { JupyterNotInstalledOrigin } from '../../client/jupyter/types';
-
-suite('Jupyter not installed notification helper', () => {
- teardown(() => {
- sinon.restore();
- });
-
- test('Notification check should return false if the Jupyter extension is installed', () => {
- const createGlobalPersistentStateStub = sinon
- .stub()
- .withArgs(jupyterExtensionNotInstalledKey, sinon.match.bool)
- .returns({ value: undefined });
-
- // Need to define 'isJupyterExtensionInstalled' for it to be stubbed.
- const jupyterExtDependencyManager = {
- isJupyterExtensionInstalled: false,
- } as IJupyterExtensionDependencyManager;
- const isJupyterExtensionInstalledStub = sinon.stub().returns(true);
- sinon.stub(jupyterExtDependencyManager, 'isJupyterExtensionInstalled').get(isJupyterExtensionInstalledStub);
-
- const notificationHelper = new JupyterNotInstalledNotificationHelper(
- {} as IApplicationShell,
- ({ createGlobalPersistentState: createGlobalPersistentStateStub } as unknown) as IPersistentStateFactory,
- jupyterExtDependencyManager,
- );
-
- const result = notificationHelper.shouldShowJupypterExtensionNotInstalledPrompt();
-
- assert.strictEqual(result, false);
- sinon.assert.calledOnce(createGlobalPersistentStateStub);
- sinon.assert.calledWith(createGlobalPersistentStateStub, jupyterExtensionNotInstalledKey, sinon.match.bool);
- sinon.assert.calledOnce(isJupyterExtensionInstalledStub);
- });
-
- test('Notification check should return false if the doNotShowAgain persistent value is set', () => {
- const createGlobalPersistentStateStub = sinon
- .stub()
- .withArgs(jupyterExtensionNotInstalledKey, sinon.match.bool)
- .returns({ value: true });
-
- const jupyterExtDependencyManager = {
- isJupyterExtensionInstalled: false,
- } as IJupyterExtensionDependencyManager;
- const isJupyterExtensionInstalledStub = sinon.stub().returns(false);
- sinon.stub(jupyterExtDependencyManager, 'isJupyterExtensionInstalled').get(isJupyterExtensionInstalledStub);
-
- const notificationHelper = new JupyterNotInstalledNotificationHelper(
- {} as IApplicationShell,
- ({ createGlobalPersistentState: createGlobalPersistentStateStub } as unknown) as IPersistentStateFactory,
- jupyterExtDependencyManager,
- );
-
- const result = notificationHelper.shouldShowJupypterExtensionNotInstalledPrompt();
-
- assert.strictEqual(result, false);
- sinon.assert.calledOnce(createGlobalPersistentStateStub);
- sinon.assert.calledWith(createGlobalPersistentStateStub, jupyterExtensionNotInstalledKey, sinon.match.bool);
- sinon.assert.notCalled(isJupyterExtensionInstalledStub);
- });
-
- test('Notification check should return true if the doNotShowAgain persistent value is not set and the Jupyter extension is not installed', () => {
- const createGlobalPersistentStateStub = sinon
- .stub()
- .withArgs(jupyterExtensionNotInstalledKey, sinon.match.bool)
- .returns({ value: undefined });
-
- const jupyterExtDependencyManager = {
- isJupyterExtensionInstalled: false,
- } as IJupyterExtensionDependencyManager;
- const isJupyterExtensionInstalledStub = sinon.stub().returns(false);
- sinon.stub(jupyterExtDependencyManager, 'isJupyterExtensionInstalled').get(isJupyterExtensionInstalledStub);
-
- const notificationHelper = new JupyterNotInstalledNotificationHelper(
- {} as IApplicationShell,
- ({ createGlobalPersistentState: createGlobalPersistentStateStub } as unknown) as IPersistentStateFactory,
- (jupyterExtDependencyManager as unknown) as IJupyterExtensionDependencyManager,
- );
-
- const result = notificationHelper.shouldShowJupypterExtensionNotInstalledPrompt();
-
- assert.strictEqual(result, true);
- sinon.assert.calledOnce(createGlobalPersistentStateStub);
- sinon.assert.calledWith(createGlobalPersistentStateStub, jupyterExtensionNotInstalledKey, sinon.match.bool);
- sinon.assert.calledOnce(isJupyterExtensionInstalledStub);
- });
-
- test('Selecting "Do not show again" should set the doNotShowAgain persistent value', async () => {
- const updateValueStub = sinon.stub();
- const createGlobalPersistentStateStub = sinon
- .stub()
- .withArgs(jupyterExtensionNotInstalledKey, sinon.match.bool)
- .returns({ updateValue: updateValueStub });
-
- const showInformationMessageStub = sinon.stub().returns(Promise.resolve(Common.doNotShowAgain));
-
- const notificationHelper = new JupyterNotInstalledNotificationHelper(
- ({ showInformationMessage: showInformationMessageStub } as unknown) as IApplicationShell,
- ({ createGlobalPersistentState: createGlobalPersistentStateStub } as unknown) as IPersistentStateFactory,
- {} as IJupyterExtensionDependencyManager,
- );
- await notificationHelper.showJupyterNotInstalledPrompt(JupyterNotInstalledOrigin.StartPageOpenBlankNotebook);
-
- sinon.assert.calledOnce(createGlobalPersistentStateStub);
- sinon.assert.calledOnce(showInformationMessageStub);
- sinon.assert.calledWith(
- showInformationMessageStub,
- Jupyter.jupyterExtensionNotInstalled(),
- Common.doNotShowAgain(),
- );
- sinon.assert.calledOnce(updateValueStub);
- sinon.assert.calledWith(updateValueStub, true);
- });
-
- test('Selecting "Do not show again" should make the prompt check return false', async () => {
- const persistentState: { value: boolean | undefined; updateValue: (v: boolean) => void } = {
- value: undefined,
- updateValue(v: boolean) {
- this.value = v;
- },
- };
- const createGlobalPersistentStateStub = sinon
- .stub()
- .withArgs(jupyterExtensionNotInstalledKey, sinon.match.bool)
- .returns(persistentState);
-
- const showInformationMessageStub = sinon.stub().returns(Promise.resolve(Common.doNotShowAgain));
-
- const notificationHelper = new JupyterNotInstalledNotificationHelper(
- ({ showInformationMessage: showInformationMessageStub } as unknown) as IApplicationShell,
- ({ createGlobalPersistentState: createGlobalPersistentStateStub } as unknown) as IPersistentStateFactory,
- {} as IJupyterExtensionDependencyManager,
- );
- await notificationHelper.showJupyterNotInstalledPrompt(JupyterNotInstalledOrigin.StartPageOpenBlankNotebook);
-
- const result = notificationHelper.shouldShowJupypterExtensionNotInstalledPrompt();
-
- assert.strictEqual(result, false);
- });
-});
diff --git a/src/test/startPage/mockDocument.ts b/src/test/mocks/mockDocument.ts
similarity index 87%
rename from src/test/startPage/mockDocument.ts
rename to src/test/mocks/mockDocument.ts
index a86265862fc8..811c591420bd 100644
--- a/src/test/startPage/mockDocument.ts
+++ b/src/test/mocks/mockDocument.ts
@@ -1,13 +1,18 @@
+/* eslint-disable max-classes-per-file */
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
'use strict';
+
import { EndOfLine, Position, Range, TextDocument, TextDocumentContentChangeEvent, TextLine, Uri } from 'vscode';
class MockLine implements TextLine {
private _range: Range;
+
private _rangeWithLineBreak: Range;
+
private _firstNonWhitespaceIndex: number | undefined;
+
private _isEmpty: boolean | undefined;
constructor(private _contents: string, private _line: number, private _offset: number) {
@@ -18,24 +23,30 @@ class MockLine implements TextLine {
public get offset(): number {
return this._offset;
}
+
public get lineNumber(): number {
return this._line;
}
+
public get text(): string {
return this._contents;
}
+
public get range(): Range {
return this._range;
}
+
public get rangeIncludingLineBreak(): Range {
return this._rangeWithLineBreak;
}
+
public get firstNonWhitespaceCharacterIndex(): number {
if (this._firstNonWhitespaceIndex === undefined) {
this._firstNonWhitespaceIndex = this._contents.trimLeft().length - this._contents.length;
}
return this._firstNonWhitespaceIndex;
}
+
public get isEmptyOrWhitespace(): boolean {
if (this._isEmpty === undefined) {
this._isEmpty = this._contents.length === 0 || this._contents.trim().length === 0;
@@ -46,12 +57,19 @@ class MockLine implements TextLine {
export class MockDocument implements TextDocument {
private _uri: Uri;
- private _version: number = 0;
+
+ private _version = 0;
+
private _lines: MockLine[] = [];
- private _contents: string = '';
+
+ private _contents = '';
+
private _isUntitled = false;
+
private _isDirty = false;
+
private _language = 'python';
+
private _onSave: (doc: TextDocument) => Promise;
constructor(
@@ -67,12 +85,12 @@ export class MockDocument implements TextDocument {
this._language = language ?? this._language;
}
- public setContent(contents: string) {
+ public setContent(contents: string): void {
this._contents = contents;
this._lines = this.createLines();
}
- public addContent(contents: string) {
+ public addContent(contents: string): void {
this.setContent(`${this._contents}\n${contents}`);
}
@@ -84,6 +102,7 @@ export class MockDocument implements TextDocument {
public get uri(): Uri {
return this._uri;
}
+
public get fileName(): string {
return this._uri.fsPath;
}
@@ -91,37 +110,48 @@ export class MockDocument implements TextDocument {
public get isUntitled(): boolean {
return this._isUntitled;
}
+
public get languageId(): string {
return this._language;
}
+
public get version(): number {
return this._version;
}
+
public get isDirty(): boolean {
return this._isDirty;
}
+
+ // eslint-disable-next-line class-methods-use-this
public get isClosed(): boolean {
return false;
}
+
public save(): Thenable {
return this._onSave(this);
}
+
+ // eslint-disable-next-line class-methods-use-this
public get eol(): EndOfLine {
return EndOfLine.LF;
}
+
public get lineCount(): number {
return this._lines.length;
}
+
public lineAt(position: Position | number): TextLine {
if (typeof position === 'number') {
return this._lines[position as number];
- } else {
- return this._lines[position.line];
}
+ return this._lines[position.line];
}
+
public offsetAt(position: Position): number {
return this.convertToOffset(position);
}
+
public positionAt(offset: number): Position {
let line = 0;
let ch = 0;
@@ -133,15 +163,17 @@ export class MockDocument implements TextDocument {
}
return new Position(line, ch);
}
+
public getText(range?: Range | undefined): string {
if (!range) {
return this._contents;
- } else {
- const startOffset = this.convertToOffset(range.start);
- const endOffset = this.convertToOffset(range.end);
- return this._contents.substr(startOffset, endOffset - startOffset);
}
+ const startOffset = this.convertToOffset(range.start);
+ const endOffset = this.convertToOffset(range.end);
+ return this._contents.substr(startOffset, endOffset - startOffset);
}
+
+ // eslint-disable-next-line class-methods-use-this
public getWordRangeAtPosition(position: Position, regexp?: RegExp | undefined): Range | undefined {
if (!regexp && position.line > 0) {
// use default when custom-regexp isn't provided
@@ -150,9 +182,13 @@ export class MockDocument implements TextDocument {
return undefined;
}
+
+ // eslint-disable-next-line class-methods-use-this
public validateRange(range: Range): Range {
return range;
}
+
+ // eslint-disable-next-line class-methods-use-this
public validatePosition(position: Position): Position {
return position;
}
@@ -175,6 +211,7 @@ export class MockDocument implements TextDocument {
});
}
+ // eslint-disable-next-line class-methods-use-this
private createTextLine(line: string, index: number, prevLine: MockLine | undefined): MockLine {
return new MockLine(
line,
diff --git a/src/test/startPage/mockDocumentManager.ts b/src/test/mocks/mockDocumentManager.ts
similarity index 88%
rename from src/test/startPage/mockDocumentManager.ts
rename to src/test/mocks/mockDocumentManager.ts
index 4a97de202c07..586f70e3f3e3 100644
--- a/src/test/startPage/mockDocumentManager.ts
+++ b/src/test/mocks/mockDocumentManager.ts
@@ -2,6 +2,7 @@
// Licensed under the MIT License.
'use strict';
+
import * as path from 'path';
import {
DecorationRenderOptions,
@@ -20,79 +21,107 @@ import {
ViewColumn,
WorkspaceEdit,
} from 'vscode';
-
-import { IDocumentManager } from '../../client/common/application/types';
import { EXTENSION_ROOT_DIR } from '../../client/constants';
import { MockDocument } from './mockDocument';
import { MockEditor } from './mockTextEditor';
+import { IMockDocumentManager } from './mockTypes';
-export class MockDocumentManager implements IDocumentManager {
+export class MockDocumentManager implements IMockDocumentManager {
public textDocuments: TextDocument[] = [];
+
public activeTextEditor: TextEditor | undefined;
+
public visibleTextEditors: TextEditor[] = [];
+
public didChangeActiveTextEditorEmitter = new EventEmitter();
+
private didOpenEmitter = new EventEmitter();
+
private didChangeVisibleEmitter = new EventEmitter();
+
private didChangeTextEditorSelectionEmitter = new EventEmitter();
+
private didChangeTextEditorOptionsEmitter = new EventEmitter();
+
private didChangeTextEditorViewColumnEmitter = new EventEmitter();
+
private didCloseEmitter = new EventEmitter();
+
private didSaveEmitter = new EventEmitter();
+
private didChangeTextDocumentEmitter = new EventEmitter();
+
public get onDidChangeActiveTextEditor(): Event {
return this.didChangeActiveTextEditorEmitter.event;
}
+
public get onDidChangeTextDocument(): Event {
return this.didChangeTextDocumentEmitter.event;
}
+
public get onDidOpenTextDocument(): Event {
return this.didOpenEmitter.event;
}
+
public get onDidChangeVisibleTextEditors(): Event {
return this.didChangeVisibleEmitter.event;
}
+
public get onDidChangeTextEditorSelection(): Event {
return this.didChangeTextEditorSelectionEmitter.event;
}
+
public get onDidChangeTextEditorOptions(): Event {
return this.didChangeTextEditorOptionsEmitter.event;
}
+
public get onDidChangeTextEditorViewColumn(): Event {
return this.didChangeTextEditorViewColumnEmitter.event;
}
+
public get onDidCloseTextDocument(): Event {
return this.didCloseEmitter.event;
}
+
public get onDidSaveTextDocument(): Event {
return this.didSaveEmitter.event;
}
+
public showTextDocument(
_document: TextDocument,
_column?: ViewColumn,
_preserveFocus?: boolean,
): Thenable;
+
public showTextDocument(_document: TextDocument | Uri, _options?: TextDocumentShowOptions): Thenable;
- public showTextDocument(document: any, _column?: any, _preserveFocus?: any): Thenable {
- this.visibleTextEditors.push(document);
+
+ public showTextDocument(document: unknown, _column?: unknown, _preserveFocus?: unknown): Thenable {
+ this.visibleTextEditors.push(document as TextEditor);
const mockEditor = new MockEditor(this, this.lastDocument as MockDocument);
this.activeTextEditor = mockEditor;
this.didChangeActiveTextEditorEmitter.fire(this.activeTextEditor);
return Promise.resolve(mockEditor);
}
+
public openTextDocument(_fileName: string | Uri): Thenable;
+
public openTextDocument(_options?: { language?: string; content?: string }): Thenable;
- public openTextDocument(_options?: any): Thenable {
- if (_options && _options.content) {
- const doc = new MockDocument(_options.content, 'Untitled-1', this.saveDocument);
+
+ public openTextDocument(_options?: unknown): Thenable {
+ const opts = _options as { content?: string };
+ if (opts && opts.content) {
+ const doc = new MockDocument(opts.content, 'Untitled-1', this.saveDocument);
this.textDocuments.push(doc);
}
return Promise.resolve(this.lastDocument);
}
+
+ // eslint-disable-next-line class-methods-use-this
public applyEdit(_edit: WorkspaceEdit): Thenable {
throw new Error('Method not implemented.');
}
- public addDocument(code: string, file: string, language?: string) {
+ public addDocument(code: string, file: string, language?: string): MockDocument {
let existing = this.textDocuments.find((d) => d.uri.fsPath === file) as MockDocument;
if (existing) {
existing.setContent(code);
@@ -103,7 +132,7 @@ export class MockDocumentManager implements IDocumentManager {
return existing;
}
- public changeDocument(file: string, changes: { range: Range; newText: string }[]) {
+ public changeDocument(file: string, changes: { range: Range; newText: string }[]): void {
const doc = this.textDocuments.find((d) => d.uri.fsPath === Uri.file(file).fsPath) as MockDocument;
if (doc) {
const contentChanges = changes.map((c) => {
@@ -126,6 +155,7 @@ export class MockDocumentManager implements IDocumentManager {
}
}
+ // eslint-disable-next-line class-methods-use-this
public createTextEditorDecorationType(_options: DecorationRenderOptions): TextEditorDecorationType {
throw new Error('Method not implemented');
}
diff --git a/src/test/startPage/mockTextEditor.ts b/src/test/mocks/mockTextEditor.ts
similarity index 76%
rename from src/test/startPage/mockTextEditor.ts
rename to src/test/mocks/mockTextEditor.ts
index f66af9c769ed..6c1c91f45577 100644
--- a/src/test/startPage/mockTextEditor.ts
+++ b/src/test/mocks/mockTextEditor.ts
@@ -1,7 +1,9 @@
+/* eslint-disable max-classes-per-file */
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
'use strict';
+
import {
DecorationOptions,
EndOfLine,
@@ -10,7 +12,6 @@ import {
Selection,
SnippetString,
TextDocument,
- TextEditor,
TextEditorDecorationType,
TextEditorEdit,
TextEditorOptions,
@@ -20,10 +21,10 @@ import {
import { noop } from '../../client/common/utils/misc';
import { MockDocument } from './mockDocument';
-import { MockDocumentManager } from './mockDocumentManager';
+import { IMockDocumentManager, IMockTextEditor } from './mockTypes';
class MockEditorEdit implements TextEditorEdit {
- constructor(private _documentManager: MockDocumentManager, private _document: MockDocument) {}
+ constructor(private _documentManager: IMockDocumentManager, private _document: MockDocument) {}
public replace(location: Selection | Range | Position, value: string): void {
this._documentManager.changeDocument(this._document.fileName, [
@@ -42,20 +43,26 @@ class MockEditorEdit implements TextEditorEdit {
},
]);
}
+
+ // eslint-disable-next-line class-methods-use-this
public delete(_location: Selection | Range): void {
throw new Error('Method not implemented.');
}
+
+ // eslint-disable-next-line class-methods-use-this
public setEndOfLine(_endOfLine: EndOfLine): void {
throw new Error('Method not implemented.');
}
}
-export class MockEditor implements TextEditor {
+export class MockEditor implements IMockTextEditor {
public selection: Selection;
+
public selections: Selection[] = [];
+
private _revealCallback: () => void;
- constructor(private _documentManager: MockDocumentManager, private _document: MockDocument) {
+ constructor(private _documentManager: IMockDocumentManager, private _document: MockDocument) {
this.selection = new Selection(0, 0, 0, 0);
this._revealCallback = noop;
}
@@ -63,15 +70,22 @@ export class MockEditor implements TextEditor {
public get document(): TextDocument {
return this._document;
}
+
+ // eslint-disable-next-line class-methods-use-this
public get visibleRanges(): Range[] {
return [];
}
+
+ // eslint-disable-next-line class-methods-use-this
public get options(): TextEditorOptions {
return {};
}
+
+ // eslint-disable-next-line class-methods-use-this
public get viewColumn(): ViewColumn | undefined {
return undefined;
}
+
public edit(
callback: (editBuilder: TextEditorEdit) => void,
_options?: { undoStopBefore: boolean; undoStopAfter: boolean } | undefined,
@@ -82,6 +96,8 @@ export class MockEditor implements TextEditor {
r(true);
});
}
+
+ // eslint-disable-next-line class-methods-use-this
public insertSnippet(
_snippet: SnippetString,
_location?: Range | Position | Range[] | Position[] | undefined,
@@ -89,23 +105,30 @@ export class MockEditor implements TextEditor {
): Thenable {
throw new Error('Method not implemented.');
}
+
+ // eslint-disable-next-line class-methods-use-this
public setDecorations(
_decorationType: TextEditorDecorationType,
_rangesOrOptions: Range[] | DecorationOptions[],
): void {
throw new Error('Method not implemented.');
}
+
public revealRange(_range: Range, _revealType?: TextEditorRevealType | undefined): void {
this._revealCallback();
}
+
+ // eslint-disable-next-line class-methods-use-this
public show(_column?: ViewColumn | undefined): void {
throw new Error('Method not implemented.');
}
+
+ // eslint-disable-next-line class-methods-use-this
public hide(): void {
throw new Error('Method not implemented.');
}
- public setRevealCallback(callback: () => void) {
+ public setRevealCallback(callback: () => void): void {
this._revealCallback = callback;
}
}
diff --git a/src/test/mocks/mockTypes.ts b/src/test/mocks/mockTypes.ts
new file mode 100644
index 000000000000..eb560efcef99
--- /dev/null
+++ b/src/test/mocks/mockTypes.ts
@@ -0,0 +1,8 @@
+import { Range, TextEditor } from 'vscode';
+import { IDocumentManager } from '../../client/common/application/types';
+
+export interface IMockTextEditor extends TextEditor {}
+
+export interface IMockDocumentManager extends IDocumentManager {
+ changeDocument(file: string, changes: { range: Range; newText: string }[]): void;
+}
diff --git a/src/test/startPage/mockWorkspaceConfig.ts b/src/test/mocks/mockWorkspaceConfig.ts
similarity index 59%
rename from src/test/startPage/mockWorkspaceConfig.ts
rename to src/test/mocks/mockWorkspaceConfig.ts
index 3cd63cf548bb..bbdbb582bd82 100644
--- a/src/test/startPage/mockWorkspaceConfig.ts
+++ b/src/test/mocks/mockWorkspaceConfig.ts
@@ -5,10 +5,21 @@
import { ConfigurationTarget, WorkspaceConfiguration } from 'vscode';
+type SectionType = {
+ key: string;
+ defaultValue?: T | undefined;
+ globalValue?: T | undefined;
+ globalLanguageValue?: T | undefined;
+ workspaceValue?: T | undefined;
+ workspaceLanguageValue?: T | undefined;
+ workspaceFolderValue?: T | undefined;
+ workspaceFolderLanguageValue?: T | undefined;
+};
+
export class MockWorkspaceConfiguration implements WorkspaceConfiguration {
- private values = new Map();
+ private values = new Map();
- constructor(defaultSettings?: any) {
+ constructor(defaultSettings?: { [key: string]: unknown }) {
if (defaultSettings) {
const keys = [...Object.keys(defaultSettings)];
keys.forEach((k) => this.values.set(k, defaultSettings[k]));
@@ -22,33 +33,23 @@ export class MockWorkspaceConfiguration implements WorkspaceConfiguration {
public get(key: string, defaultValue?: T): T | undefined {
if (this.values.has(key)) {
- return this.values.get(key);
+ return this.values.get(key) as T;
}
- return arguments.length > 1 ? defaultValue : (undefined as any);
+ return arguments.length > 1 ? defaultValue : undefined;
}
+
public has(section: string): boolean {
return this.values.has(section);
}
- public inspect(
- section: string,
- ):
- | {
- key: string;
- defaultValue?: T | undefined;
- globalValue?: T | undefined;
- globalLanguageValue?: T | undefined;
- workspaceValue?: T | undefined;
- workspaceLanguageValue?: T | undefined;
- workspaceFolderValue?: T | undefined;
- workspaceFolderLanguageValue?: T | undefined;
- }
- | undefined {
- return this.values.get(section);
+
+ public inspect(section: string): SectionType | undefined {
+ return this.values.get(section) as SectionType;
}
+
public update(
section: string,
- value: any,
+ value: unknown,
_configurationTarget?: boolean | ConfigurationTarget | undefined,
): Promise {
this.values.set(section, value);
diff --git a/src/test/startPage/mockCommandManager.ts b/src/test/startPage/mockCommandManager.ts
deleted file mode 100644
index 6ee2befb8254..000000000000
--- a/src/test/startPage/mockCommandManager.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-'use strict';
-import { noop } from 'lodash';
-import { Disposable, TextEditor, TextEditorEdit } from 'vscode';
-
-import { ICommandNameArgumentTypeMapping } from '../../client/common/application/commands';
-import { ICommandManager } from '../../client/common/application/types';
-
-export class MockCommandManager implements ICommandManager {
- private commands: Map any> = new Map any>();
-
- public dispose() {
- this.commands.clear();
- }
- public registerCommand<
- E extends keyof ICommandNameArgumentTypeMapping,
- U extends ICommandNameArgumentTypeMapping[E]
- >(command: E, callback: (...args: U) => any, thisArg?: any): Disposable {
- this.commands.set(command, thisArg ? (callback.bind(thisArg) as any) : (callback as any));
- return {
- dispose: () => {
- noop();
- },
- };
- }
-
- public registerTextEditorCommand(
- _command: string,
- _callback: (textEditor: TextEditor, edit: TextEditorEdit, ...args: any[]) => void,
- _thisArg?: any,
- ): Disposable {
- throw new Error('Method not implemented.');
- }
- public executeCommand<
- T,
- E extends keyof ICommandNameArgumentTypeMapping,
- U extends ICommandNameArgumentTypeMapping[E]
- >(command: E, ...rest: U): Thenable {
- const func = this.commands.get(command);
- if (func) {
- const result = func(...rest);
- const tPromise = result as Promise;
- if (tPromise) {
- return tPromise;
- }
- return Promise.resolve(result);
- }
- return Promise.resolve(undefined);
- }
-
- public getCommands(_filterInternal?: boolean): Thenable {
- const keys = Object.keys(this.commands);
- return Promise.resolve(keys);
- }
-}
diff --git a/src/test/startPage/mockExtensions.ts b/src/test/startPage/mockExtensions.ts
deleted file mode 100644
index d249cca75d65..000000000000
--- a/src/test/startPage/mockExtensions.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-'use strict';
-import { injectable } from 'inversify';
-import { Event, Extension, extensions } from 'vscode';
-
-import { IExtensions } from '../../client/common/types';
-
-@injectable()
-export class MockExtensions implements IExtensions {
- public all: Extension[] = [];
- public getExtension(_extensionId: string): Extension | undefined {
- return undefined;
- }
-
- public get onDidChange(): Event {
- return extensions.onDidChange;
- }
-}
diff --git a/src/test/startPage/mockPythonSettings.ts b/src/test/startPage/mockPythonSettings.ts
deleted file mode 100644
index 042791715a1a..000000000000
--- a/src/test/startPage/mockPythonSettings.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import { PythonSettings } from '../../client/common/configSettings';
-
-export class MockPythonSettings extends PythonSettings {
- public fireChangeEvent(): void {
- this.changed.fire();
- }
-
- // eslint-disable-next-line class-methods-use-this
- protected getPythonExecutable(v: string): string {
- // Don't validate python paths during tests. On windows this can take 4 or 5 seconds
- // and slow down every test
- return v;
- }
-}
diff --git a/src/test/startPage/mockWorkspaceFolder.ts b/src/test/startPage/mockWorkspaceFolder.ts
deleted file mode 100644
index 7473df5a26c1..000000000000
--- a/src/test/startPage/mockWorkspaceFolder.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import { Uri, WorkspaceFolder } from 'vscode';
-
-export class MockWorkspaceFolder implements WorkspaceFolder {
- public uri: Uri;
- public name: string;
- public ownedResources = new Set();
-
- constructor(folder: string, public index: number) {
- this.uri = Uri.file(folder);
- this.name = folder;
- }
-}
diff --git a/src/test/startPage/mountedWebView.ts b/src/test/startPage/mountedWebView.ts
deleted file mode 100644
index 854996469a6d..000000000000
--- a/src/test/startPage/mountedWebView.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { ReactWrapper } from 'enzyme';
-import { noop } from 'lodash';
-import { Event, EventEmitter, Uri } from 'vscode';
-import {
- IWebviewPanel,
- IWebviewPanelMessageListener,
- IWebviewPanelOptions,
- WebviewMessage,
-} from '../../client/common/application/types';
-import { traceError, traceInfo } from '../../client/common/logger';
-import { IDisposable } from '../../client/common/types';
-import { createDeferred } from '../../client/common/utils/async';
-import { IVsCodeApi } from '../../startPage-ui/react-common/postOffice';
-
-export type WaitForMessageOptions = {
- /**
- * Timeout for waiting for message.
- * Defaults to 65_000ms.
- *
- * @type {number}
- */
- timeoutMs?: number;
- /**
- * Number of times the message should be received.
- * Defaults to 1.
- *
- * @type {number}
- */
- numberOfTimes?: number;
-
- // Optional check for the payload of the message
- // will only return (or count) message if this returns true
-
- withPayload?(payload: any): boolean;
-};
-
-export interface IMountedWebView extends IWebviewPanel, IDisposable {
- readonly id: string;
- readonly wrapper: ReactWrapper, React.Component>;
- readonly onDisposed: Event;
- postMessage(ev: WebviewMessage): void;
- changeViewState(active: boolean, visible: boolean): void;
- addMessageListener(callback: (m: string, p: any) => void): void;
- removeMessageListener(callback: (m: string, p: any) => void): void;
- attach(options: IWebviewPanelOptions): void;
- waitForMessage(message: string, options?: WaitForMessageOptions): Promise;
-}
-
-export class MountedWebView implements IMountedWebView, IDisposable {
- public wrapper: ReactWrapper, React.Component>;
- private missedMessages: any[] = [];
- private webPanelListener: IWebviewPanelMessageListener | undefined;
- private reactMessageCallback: ((ev: MessageEvent) => void) | undefined;
- private extraListeners: ((m: string, p: any) => void)[] = [];
- private disposed = false;
- private active = true;
- private visible = true;
- private disposedEvent = new EventEmitter();
- private loadFailedEmitter = new EventEmitter();
-
- constructor(mount: () => ReactWrapper, React.Component>, public readonly id: string) {
- // Setup the acquireVsCodeApi. The react control will cache this value when it's mounted.
- const globalAcquireVsCodeApi = (): IVsCodeApi => {
- return {
- postMessage: (msg: any) => {
- this.postMessageToWebPanel(msg);
- },
-
- setState: (_msg: any) => {},
-
- getState: () => {
- return {};
- },
- };
- };
-
- (global as any)['acquireVsCodeApi'] = globalAcquireVsCodeApi;
-
- // Remap event handlers to point to the container.
- const oldListener = window.addEventListener;
- window.addEventListener = (event: string, cb: any) => {
- if (event === 'message') {
- this.reactMessageCallback = cb;
- }
- };
-
- // Mount our main panel. This will make the global api be cached and have the event handler registered
- this.wrapper = mount();
-
- // We can remove the global api and event listener now.
- delete (global as any).acquireVsCodeApi;
- window.addEventListener = oldListener;
- }
-
- public get onDisposed() {
- return this.disposedEvent.event;
- }
- public get loadFailed(): Event {
- return this.loadFailedEmitter.event;
- }
- public attach(options: IWebviewPanelOptions) {
- this.webPanelListener = options.listener;
-
- // Send messages that were already posted but were missed.
- // During normal operation, the react control will not be created before
- // the webPanelListener
- if (this.missedMessages.length && this.webPanelListener) {
- // This needs to be async because we are being called in the ctor of the webpanel. It can't
- // handle some messages during the ctor.
- setTimeout(() => {
- this.missedMessages.forEach((m) =>
- this.webPanelListener ? this.webPanelListener.onMessage(m.type, m.payload) : noop(),
- );
- this.missedMessages = [];
- }, 0);
- }
- }
-
- public async waitForMessage(message: string, options?: WaitForMessageOptions): Promise {
- const timeoutMs = options && options.timeoutMs ? options.timeoutMs : undefined;
- const numberOfTimes = options && options.numberOfTimes ? options.numberOfTimes : 1;
- // Wait for the mounted web panel to send a message back to the data explorer
- const promise = createDeferred();
- traceInfo(`Waiting for message ${message} with timeout of ${timeoutMs}`);
- let handler: (m: string, p: any) => void;
- const timer = timeoutMs
- ? setTimeout(() => {
- if (!promise.resolved) {
- promise.reject(new Error(`Waiting for ${message} timed out`));
- }
- }, timeoutMs)
- : undefined;
- let timesMessageReceived = 0;
- const dispatchedAction = `DISPATCHED_ACTION_${message}`;
- handler = (m: string, payload: any) => {
- if (m === message || m === dispatchedAction) {
- // First verify the payload matches
- if (options?.withPayload) {
- if (!options.withPayload(payload)) {
- return;
- }
- }
-
- timesMessageReceived += 1;
- if (timesMessageReceived < numberOfTimes) {
- return;
- }
- if (timer) {
- clearTimeout(timer);
- }
- this.removeMessageListener(handler);
- // Make sure to rerender current state.
- if (this.wrapper) {
- this.wrapper.update();
- }
- if (m === message) {
- promise.resolve();
- } else {
- // It could a redux dispatched message.
- // Wait for 10ms, wait for other stuff to finish.
- // We can wait for 100ms or 1s. But thats too long.
- // The assumption is that currently we do not have any setTimeouts
- // in UI code that's in the magnitude of 100ms or more.
- // We do have a couple of setTiemout's, but they wait for 1ms, not 100ms.
- // 10ms more than sufficient for all the UI timeouts.
- setTimeout(() => promise.resolve(), 10);
- }
- }
- };
-
- this.addMessageListener(handler);
- return promise.promise;
- }
-
- public asWebviewUri(localResource: Uri): Uri {
- return localResource;
- }
- public setTitle(_val: string): void {
- noop();
- }
- public async show(_preserveFocus: boolean): Promise {
- noop();
- }
- public isVisible(): boolean {
- return this.visible;
- }
- public postMessage(m: WebviewMessage): void {
- // Actually send to the UI
- if (this.reactMessageCallback) {
- const reactHelpers = require('./reactHelpers') as typeof import('./reactHelpers');
- const message = reactHelpers.createMessageEvent(m);
- this.reactMessageCallback(message);
- if (m.payload) {
- delete m.payload;
- }
- }
- }
- public close(): void {
- noop();
- }
- public isActive(): boolean {
- return this.active;
- }
- public updateCwd(_cwd: string): void {
- noop();
- }
- public dispose() {
- if (!this.disposed) {
- this.disposed = true;
- if (this.wrapper.length) {
- this.wrapper.unmount();
- }
- this.disposedEvent.fire();
- }
- }
-
- public changeViewState(active: boolean, visible: boolean) {
- this.active = active;
- this.visible = visible;
- if (this.webPanelListener) {
- this.webPanelListener.onChangeViewState(this);
- }
- }
- public addMessageListener(callback: (m: string, p: any) => void) {
- this.extraListeners.push(callback);
- }
-
- public removeMessageListener(callback: (m: string, p: any) => void) {
- const index = this.extraListeners.indexOf(callback);
- if (index >= 0) {
- this.extraListeners.splice(index, 1);
- }
- }
- private postMessageToWebPanel(msg: any) {
- if (this.disposed && !msg.type.startsWith(`DISPATCHED`)) {
- traceError(`Posting to disposed mount.`);
- }
- if (this.webPanelListener) {
- this.webPanelListener.onMessage(msg.type, msg.payload);
- } else {
- this.missedMessages.push({ type: msg.type, payload: msg.payload });
- }
- if (this.extraListeners.length) {
- this.extraListeners.forEach((e) => e(msg.type, msg.payload));
- }
-
- // Clear out msg payload
- delete msg.payload;
-
- // unmount ourselves if this is the close message
- if (msg.type === 'close') {
- this.dispose();
- }
- }
-}
diff --git a/src/test/startPage/mountedWebViewFactory.ts b/src/test/startPage/mountedWebViewFactory.ts
deleted file mode 100644
index d430cafcd3a2..000000000000
--- a/src/test/startPage/mountedWebViewFactory.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-import { ReactWrapper } from 'enzyme';
-import { inject, injectable } from 'inversify';
-import { IDisposable, IDisposableRegistry } from '../../client/common/types';
-import { IMountedWebView, MountedWebView } from './mountedWebView';
-
-export const IMountedWebViewFactory = Symbol('IMountedWebViewFactory');
-
-export interface IMountedWebViewFactory {
- get(id: string): IMountedWebView;
-
- create(id: string, mount: () => ReactWrapper, React.Component>): IMountedWebView;
-}
-
-@injectable()
-export class MountedWebViewFactory implements IMountedWebViewFactory, IDisposable {
- private map = new Map();
-
- constructor(@inject(IDisposableRegistry) readonly disposables: IDisposableRegistry) {
- disposables.push(this);
- }
-
- public dispose() {
- this.map.forEach((v) => v.dispose());
- this.map.clear();
- }
- public get(id: string): IMountedWebView {
- const obj = this.map.get(id);
- if (!obj) {
- throw new Error(`No mounted web view found for id ${id}`);
- }
- return obj;
- }
-
- public create(id: string, mount: () => ReactWrapper, React.Component>): IMountedWebView {
- if (this.map.has(id)) {
- throw new Error(`Mounted web view already exists for id ${id}`);
- }
- const obj = new MountedWebView(mount, id);
- obj.onDisposed(() => this.map.delete(id));
- this.map.set(id, obj);
- return obj;
- }
-}
diff --git a/src/test/startPage/reactHelpers.ts b/src/test/startPage/reactHelpers.ts
deleted file mode 100644
index e0cbbe3f68a4..000000000000
--- a/src/test/startPage/reactHelpers.ts
+++ /dev/null
@@ -1,521 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-'use strict';
-
-// Note: Don't change this to a tsx file as it loads in the unit tests. That will mess up mocha
-
-// Custom module loader so we can skip loading the 'canvas' module which won't load
-// inside of vscode
-
-const Module = require('module');
-
-(function () {
- const origRequire = Module.prototype.require;
- const _require = (context: any, filepath: any) => {
- return origRequire.call(context, filepath);
- };
- Module.prototype.require = function (filepath: string) {
- if (filepath === 'canvas') {
- try {
- // Make sure we aren't inside of vscode. The nodejs version of Canvas won't match. At least sometimes.
- if (require('vscode')) {
- return '';
- }
- } catch {
- // This should happen when not inside vscode.
- }
- }
-
- return _require(this, filepath);
- };
-})();
-
-// Monkey patch the stylesheet impl from jsdom before loading jsdom.
-// This is necessary to get slickgrid to work.
-const utils = require('jsdom/lib/jsdom/living/generated/utils');
-const ssExports = require('jsdom/lib/jsdom/living/helpers/stylesheets');
-if (ssExports && ssExports.createStylesheet) {
- const orig = ssExports.createStylesheet;
- ssExports.createStylesheet = (sheetText: any, elementImpl: any, baseURL: any) => {
- // Call the original.
- orig(sheetText, elementImpl, baseURL);
-
- // Then pull out the style sheet and add some properties. See the discussion here
- // https://github.com/jsdom/jsdom/issues/992
- if (elementImpl.sheet) {
- elementImpl.sheet.href = baseURL;
- elementImpl.sheet.ownerNode = utils.wrapperForImpl(elementImpl);
- }
- };
-}
-
-import { configure } from 'enzyme';
-import * as Adapter from 'enzyme-adapter-react-16';
-import { DOMWindow, JSDOM } from 'jsdom';
-
-import { noop } from '../../client/common/utils/misc';
-
-class MockCanvas implements CanvasRenderingContext2D {
- public canvas!: HTMLCanvasElement;
- public restore(): void {
- throw new Error('Method not implemented.');
- }
- public save(): void {
- throw new Error('Method not implemented.');
- }
- public getTransform(): DOMMatrix {
- throw new Error('Method not implemented.');
- }
- public resetTransform(): void {
- throw new Error('Method not implemented.');
- }
- public rotate(_angle: number): void {
- throw new Error('Method not implemented.');
- }
- public scale(_x: number, _y: number): void {
- throw new Error('Method not implemented.');
- }
- public setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void;
- public setTransform(transform?: DOMMatrix2DInit | undefined): void;
- public setTransform(_a?: any, _b?: any, _c?: any, _d?: any, _e?: any, _f?: any) {
- throw new Error('Method not implemented.');
- }
- public transform(_a: number, _b: number, _c: number, _d: number, _e: number, _f: number): void {
- throw new Error('Method not implemented.');
- }
- public translate(_x: number, _y: number): void {
- throw new Error('Method not implemented.');
- }
- public globalAlpha!: number;
- public globalCompositeOperation!: string;
- public imageSmoothingEnabled!: boolean;
- public imageSmoothingQuality!: ImageSmoothingQuality;
- public fillStyle!: string | CanvasGradient | CanvasPattern;
- public strokeStyle!: string | CanvasGradient | CanvasPattern;
- public createLinearGradient(_x0: number, _y0: number, _x1: number, _y1: number): CanvasGradient {
- throw new Error('Method not implemented.');
- }
- public createPattern(_image: CanvasImageSource, _repetition: string): CanvasPattern | null {
- throw new Error('Method not implemented.');
- }
- public createRadialGradient(
- _x0: number,
- _y0: number,
- _r0: number,
- _x1: number,
- _y1: number,
- _r1: number,
- ): CanvasGradient {
- throw new Error('Method not implemented.');
- }
- public shadowBlur!: number;
- public shadowColor!: string;
- public shadowOffsetX!: number;
- public shadowOffsetY!: number;
- public filter!: string;
- public clearRect(_x: number, _y: number, _w: number, _h: number): void {
- throw new Error('Method not implemented.');
- }
- public fillRect(_x: number, _y: number, _w: number, _h: number): void {
- throw new Error('Method not implemented.');
- }
- public strokeRect(_x: number, _y: number, _w: number, _h: number): void {
- throw new Error('Method not implemented.');
- }
- public beginPath(): void {
- throw new Error('Method not implemented.');
- }
- public clip(fillRule?: 'nonzero' | 'evenodd' | undefined): void;
- public clip(path: Path2D, fillRule?: 'nonzero' | 'evenodd' | undefined): void;
- public clip(_path?: any, _fillRule?: any) {
- throw new Error('Method not implemented.');
- }
- public fill(fillRule?: 'nonzero' | 'evenodd' | undefined): void;
- public fill(path: Path2D, fillRule?: 'nonzero' | 'evenodd' | undefined): void;
- public fill(_path?: any, _fillRule?: any) {
- throw new Error('Method not implemented.');
- }
- public isPointInPath(x: number, y: number, fillRule?: 'nonzero' | 'evenodd' | undefined): boolean;
- public isPointInPath(path: Path2D, x: number, y: number, fillRule?: 'nonzero' | 'evenodd' | undefined): boolean;
- public isPointInPath(_path: any, _x: any, _y?: any, _fillRule?: any): boolean {
- throw new Error('Method not implemented.');
- }
- public isPointInStroke(x: number, y: number): boolean;
- public isPointInStroke(path: Path2D, x: number, y: number): boolean;
- public isPointInStroke(_path: any, _x: any, _y?: any): boolean {
- throw new Error('Method not implemented.');
- }
- public stroke(): void;
-
- public stroke(path: Path2D): void;
- public stroke(_path?: any) {
- throw new Error('Method not implemented.');
- }
- public drawFocusIfNeeded(element: Element): void;
- public drawFocusIfNeeded(path: Path2D, element: Element): void;
- public drawFocusIfNeeded(_path: any, _element?: any) {
- throw new Error('Method not implemented.');
- }
- public scrollPathIntoView(): void;
-
- public scrollPathIntoView(path: Path2D): void;
- public scrollPathIntoView(_path?: any) {
- throw new Error('Method not implemented.');
- }
- public fillText(_text: string, _x: number, _y: number, _maxWidth?: number | undefined): void {
- throw new Error('Method not implemented.');
- }
- public measureText(_text: string): TextMetrics {
- throw new Error('Method not implemented.');
- }
- public strokeText(_text: string, _x: number, _y: number, _maxWidth?: number | undefined): void {
- throw new Error('Method not implemented.');
- }
- public drawImage(image: CanvasImageSource, dx: number, dy: number): void;
- public drawImage(image: CanvasImageSource, dx: number, dy: number, dw: number, dh: number): void;
- public drawImage(
- image: CanvasImageSource,
- sx: number,
- sy: number,
- sw: number,
- sh: number,
- dx: number,
- dy: number,
- dw: number,
- dh: number,
- ): void;
- public drawImage(
- _image: any,
- _sx: any,
- _sy: any,
- _sw?: any,
- _sh?: any,
- _dx?: any,
- _dy?: any,
- _dw?: any,
- _dh?: any,
- ) {
- throw new Error('Method not implemented.');
- }
- public createImageData(sw: number, sh: number): ImageData;
- public createImageData(imagedata: ImageData): ImageData;
- public createImageData(_sw: any, _sh?: any): ImageData {
- throw new Error('Method not implemented.');
- }
- public getImageData(_sx: number, _sy: number, _sw: number, _sh: number): ImageData {
- throw new Error('Method not implemented.');
- }
- public putImageData(imagedata: ImageData, dx: number, dy: number): void;
- public putImageData(
- imagedata: ImageData,
- dx: number,
- dy: number,
- dirtyX: number,
- dirtyY: number,
- dirtyWidth: number,
- dirtyHeight: number,
- ): void;
- public putImageData(
- _imagedata: any,
- _dx: any,
- _dy: any,
- _dirtyX?: any,
- _dirtyY?: any,
- _dirtyWidth?: any,
- _dirtyHeight?: any,
- ) {
- throw new Error('Method not implemented.');
- }
- public lineCap!: CanvasLineCap;
- public lineDashOffset!: number;
- public lineJoin!: CanvasLineJoin;
- public lineWidth!: number;
- public miterLimit!: number;
- public getLineDash(): number[] {
- throw new Error('Method not implemented.');
- }
- public setLineDash(_segments: number[]): void {
- throw new Error('Method not implemented.');
- }
- public direction!: CanvasDirection;
- public font!: string;
- public textAlign!: CanvasTextAlign;
- public textBaseline!: CanvasTextBaseline;
- public arc(
- _x: number,
- _y: number,
- _radius: number,
- _startAngle: number,
- _endAngle: number,
- _anticlockwise?: boolean | undefined,
- ): void {
- throw new Error('Method not implemented.');
- }
- public arcTo(_x1: number, _y1: number, _x2: number, _y2: number, _radius: number): void {
- throw new Error('Method not implemented.');
- }
- public bezierCurveTo(_cp1x: number, _cp1y: number, _cp2x: number, _cp2y: number, _x: number, _y: number): void {
- throw new Error('Method not implemented.');
- }
- public closePath(): void {
- throw new Error('Method not implemented.');
- }
- public ellipse(
- _x: number,
- _y: number,
- _radiusX: number,
- _radiusY: number,
- _rotation: number,
- _startAngle: number,
- _endAngle: number,
- _anticlockwise?: boolean | undefined,
- ): void {
- throw new Error('Method not implemented.');
- }
- public lineTo(_x: number, _y: number): void {
- throw new Error('Method not implemented.');
- }
- public moveTo(_x: number, _y: number): void {
- throw new Error('Method not implemented.');
- }
- public quadraticCurveTo(_cpx: number, _cpy: number, _x: number, _y: number): void {
- throw new Error('Method not implemented.');
- }
- public rect(_x: number, _y: number, _w: number, _h: number): void {
- throw new Error('Method not implemented.');
- }
-}
-
-const mockCanvas = new MockCanvas();
-
-export function setUpDomEnvironment() {
- const dom = new JSDOM('', {
- pretendToBeVisual: true,
- url: 'http://localhost',
- });
- const { window } = dom;
-
- try {
- // If running inside of vscode, we need to mock the canvas because the real canvas is not
- // returned.
- if (require('vscode')) {
- window.HTMLCanvasElement.prototype.getContext = (contextId: string, _contextAttributes?: {}): any => {
- if (contextId === '2d') {
- return mockCanvas;
- }
- return null;
- };
- }
- } catch {
- noop();
- }
-
- window.HTMLCanvasElement.prototype.toDataURL = function () {
- return '';
- };
-
- // tslist:disable-next-line:no-string-literal no-any
- (global as any)['Element'] = window.Element;
- // tslist:disable-next-line:no-string-literal no-any
- (global as any)['location'] = window.location;
-
- (global as any)['window'] = window;
-
- (global as any)['document'] = window.document;
-
- (global as any)['navigator'] = {
- userAgent: 'node.js',
- platform: 'node',
- };
- (global as any)['Event'] = window.Event;
- (global as any)['KeyboardEvent'] = window.KeyboardEvent;
- (global as any)['MouseEvent'] = window.MouseEvent;
- (global as any)['DocumentFragment'] = window.DocumentFragment;
-
- (global as any)['getComputedStyle'] = window.getComputedStyle;
-
- (global as any)['self'] = window;
- copyProps(window, global);
-
- // Special case. Monaco needs queryCommandSupported
- (global as any)['document'].queryCommandSupported = () => false;
-
- // Special case. Transform needs createRange
- (global as any)['document'].createRange = () => ({
- createContextualFragment: (str: string) => JSDOM.fragment(str),
- setEnd: (_endNode: any, _endOffset: any) => noop(),
- setStart: (_startNode: any, _startOffset: any) => noop(),
- getBoundingClientRect: () => null,
- getClientRects: () => [],
- });
-
- // Another special case. CodeMirror needs selection
-
- (global as any)['document'].selection = {
- anchorNode: null,
- anchorOffset: 0,
- baseNode: null,
- baseOffset: 0,
- extentNode: null,
- extentOffset: 0,
- focusNode: null,
- focusOffset: 0,
- isCollapsed: false,
- rangeCount: 0,
- type: '',
- addRange: (_range: Range) => noop(),
- createRange: () => null,
- collapse: (_parentNode: Node, _offset: number) => noop(),
- collapseToEnd: noop,
- collapseToStart: noop,
- containsNode: (_node: Node, _partlyContained: boolean) => false,
- deleteFromDocument: noop,
- empty: noop,
- extend: (_newNode: Node, _offset: number) => noop(),
- getRangeAt: (_index: number) => null,
- removeAllRanges: noop,
- removeRange: (_range: Range) => noop(),
- selectAllChildren: (_parentNode: Node) => noop(),
- setBaseAndExtent: (_baseNode: Node, _baseOffset: number, _extentNode: Node, _extentOffset: number) => noop(),
- setPosition: (_parentNode: Node, _offset: number) => noop(),
- toString: () => '{Selection}',
- };
-
- (global as any)['DOMParser'] = dom.window.DOMParser;
- (global as any)['Blob'] = dom.window.Blob;
-
- configure({ adapter: new Adapter() });
-
- // Special case for the node_modules\monaco-editor\esm\vs\editor\browser\config\configuration.js. It doesn't
- // export the function we need to dispose of the timer it's set. So force it to.
- const configurationRegex = /.*(\\|\/)node_modules(\\|\/)monaco-editor(\\|\/)esm(\\|\/)vs(\\|\/)editor(\\|\/)browser(\\|\/)config(\\|\/)configuration\.js/g;
- const _oldLoader = require.extensions['.js'];
-
- require.extensions['.js'] = function (mod: any, filename) {
- if (configurationRegex.test(filename)) {
- let content = require('fs').readFileSync(filename, 'utf8');
- content += 'export function getCSSBasedConfiguration() { return CSSBasedConfiguration.INSTANCE; };\n';
- mod._compile(content, filename);
- } else {
- _oldLoader(mod, filename);
- }
- };
-}
-
-function copyProps(src: any, target: any) {
- const props = Object.getOwnPropertyNames(src).filter((prop) => typeof target[prop] === undefined);
- props.forEach((p: string) => {
- target[p] = src[p];
- });
-}
-
-// map of string chars to keycodes and whether or not shift has to be hit
-// this is necessary to generate keypress/keydown events.
-// There doesn't seem to be an official way to do this (according to stack overflow)
-// so just hardcoding it here.
-const keyMap: { [key: string]: { code: number; shift: boolean } } = {
- A: { code: 65, shift: false },
- B: { code: 66, shift: false },
- C: { code: 67, shift: false },
- D: { code: 68, shift: false },
- E: { code: 69, shift: false },
- F: { code: 70, shift: false },
- G: { code: 71, shift: false },
- H: { code: 72, shift: false },
- I: { code: 73, shift: false },
- J: { code: 74, shift: false },
- K: { code: 75, shift: false },
- L: { code: 76, shift: false },
- M: { code: 77, shift: false },
- N: { code: 78, shift: false },
- O: { code: 79, shift: false },
- P: { code: 80, shift: false },
- Q: { code: 81, shift: false },
- R: { code: 82, shift: false },
- S: { code: 83, shift: false },
- T: { code: 84, shift: false },
- U: { code: 85, shift: false },
- V: { code: 86, shift: false },
- W: { code: 87, shift: false },
- X: { code: 88, shift: false },
- Y: { code: 89, shift: false },
- Z: { code: 90, shift: false },
- ESCAPE: { code: 27, shift: false },
- '0': { code: 48, shift: false },
- '1': { code: 49, shift: false },
- '2': { code: 50, shift: false },
- '3': { code: 51, shift: false },
- '4': { code: 52, shift: false },
- '5': { code: 53, shift: false },
- '6': { code: 54, shift: false },
- '7': { code: 55, shift: false },
- '8': { code: 56, shift: false },
- '9': { code: 57, shift: false },
- ')': { code: 48, shift: true },
- '!': { code: 49, shift: true },
- '@': { code: 50, shift: true },
- '#': { code: 51, shift: true },
- $: { code: 52, shift: true },
- '%': { code: 53, shift: true },
- '^': { code: 54, shift: true },
- '&': { code: 55, shift: true },
- '*': { code: 56, shift: true },
- '(': { code: 57, shift: true },
- '[': { code: 219, shift: false },
- '\\': { code: 209, shift: false },
- ']': { code: 221, shift: false },
- '{': { code: 219, shift: true },
- '|': { code: 209, shift: true },
- '}': { code: 221, shift: true },
- ';': { code: 186, shift: false },
- "'": { code: 222, shift: false },
- ':': { code: 186, shift: true },
- '"': { code: 222, shift: true },
- ',': { code: 188, shift: false },
- '.': { code: 190, shift: false },
- '/': { code: 191, shift: false },
- '<': { code: 188, shift: true },
- '>': { code: 190, shift: true },
- '?': { code: 191, shift: true },
- '`': { code: 192, shift: false },
- '~': { code: 192, shift: true },
- ' ': { code: 32, shift: false },
- '\n': { code: 13, shift: false },
- '\r': { code: 0, shift: false }, // remove \r from the text.
-};
-
-export function createMessageEvent(data: any): MessageEvent {
- const domWindow = (window as any) as DOMWindow;
- return new domWindow.MessageEvent('message', { data });
-}
-
-export function createKeyboardEvent(type: string, options: KeyboardEventInit): KeyboardEvent {
- const domWindow = (window as any) as DOMWindow;
- options.bubbles = true;
- options.cancelable = true;
-
- // charCodes and keyCodes are different things. Compute the keycode for cm to work.
- // This is the key (on an english qwerty keyboard) that would have to be hit to generate the key
- // This site was a great help with the mapping:
- // https://www.cambiaresearch.com/articles/15/javascript-char-codes-key-codes
- const upper = options.key!.toUpperCase();
- const keyCode = keyMap.hasOwnProperty(upper) ? keyMap[upper].code : options.key!.charCodeAt(0);
- const shift = keyMap.hasOwnProperty(upper) ? keyMap[upper].shift || options.shiftKey : options.shiftKey;
-
- // JSDOM doesn't support typescript so well. The options are supposed to be flexible to support just about anything, but
- // the type KeyboardEventInit only supports the minimum. Stick in extras with some typecasting hacks
- return new domWindow.KeyboardEvent(type, ({ ...options, keyCode, shiftKey: shift } as any) as KeyboardEventInit);
-}
-
-export function createInputEvent(): Event {
- const domWindow = (window as any) as DOMWindow;
- return new domWindow.Event('input', { bubbles: true, cancelable: false });
-}
-
-export function blurWindow() {
- // blur isn't implemented. We just need to dispatch the blur event
- const domWindow = (window as any) as DOMWindow;
- const blurEvent = new domWindow.Event('blur', { bubbles: true });
- domWindow.dispatchEvent(blurEvent);
-}
diff --git a/src/test/startPage/startPage.functional.test.tsx b/src/test/startPage/startPage.functional.test.tsx
deleted file mode 100644
index 83180e68ca43..000000000000
--- a/src/test/startPage/startPage.functional.test.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-'use strict';
-
-import * as assert from 'assert';
-import { ComponentClass, mount, ReactWrapper } from 'enzyme';
-import * as React from 'react';
-import { IStartPage } from '../../client/common/startPage/types';
-import { IStartPageProps, StartPage } from '../../startPage-ui/startPage/startPage';
-import { StartPageIocContainer } from './startPageIocContainer';
-
-suite('StartPage tests', () => {
- let start: IStartPage;
- let ioc: StartPageIocContainer;
-
- setup(async () => {
- process.env.UITEST_DISABLE_INSIDERS = '1';
- ioc = new StartPageIocContainer();
- ioc.registerStartPageTypes();
- });
- teardown(async () => {
- await ioc.dispose();
- });
-
- function mountWebView(): ReactWrapper, React.Component> {
- // Setup our webview panel
- const wrapper = ioc.createWebView(
- () => mount((IStartPage);
-
- return wrapper.wrapper;
- }
-
- function runMountedTest(
- name: string,
- testFunc: (wrapper: ReactWrapper, React.Component>) => Promise,
- ) {
- test(name, async () => {
- const wrapper = mountWebView();
- try {
- await testFunc(wrapper);
- } finally {
- // Make sure to unmount the wrapper or it will interfere with other tests
- if (wrapper && wrapper.length) {
- wrapper.unmount();
- }
- }
- });
- }
-
- function waitForComponentDidUpdate(component: React.Component): Promise {
- return new Promise((resolve, reject) => {
- if (component) {
- let originalUpdateFunc = component.componentDidUpdate;
- if (originalUpdateFunc) {
- originalUpdateFunc = originalUpdateFunc.bind(component);
- }
-
- component.componentDidUpdate = (prevProps: Readonly
, prevState: Readonly ): Promise, snapshot?: C) => {
- // When the component updates, call the original function and resolve our promise
- if (originalUpdateFunc) {
- originalUpdateFunc(prevProps, prevState, snapshot);
- }
-
- // Reset our update function
- component.componentDidUpdate = originalUpdateFunc;
-
- // Finish the promise
- resolve();
- };
- } else {
- reject(new Error('Cannot find the component for waitForComponentDidUpdate'));
- }
- });
- }
-
- async function waitForUpdate';
-
- runMountedTest('Load Start Page', async (wrapper) => {
- await waitForStartPage(wrapper);
- const dom = wrapper.getDOMNode();
- assert.ok(dom.innerHTML.includes(startPageDom), 'DOM is not loading correctly');
- });
-});
diff --git a/src/test/startPage/startPage.unit.test.ts b/src/test/startPage/startPage.unit.test.ts
deleted file mode 100644
index 0f66880f8cff..000000000000
--- a/src/test/startPage/startPage.unit.test.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-'use strict';
-
-import * as assert from 'assert';
-import * as sinon from 'sinon';
-import * as typemoq from 'typemoq';
-import { ExtensionContext } from 'vscode';
-import {
- IApplicationEnvironment,
- IApplicationShell,
- ICommandManager,
- IDocumentManager,
- IJupyterExtensionDependencyManager,
- IWebviewPanelProvider,
- IWorkspaceService,
-} from '../../client/common/application/types';
-import { PythonSettings } from '../../client/common/configSettings';
-import { IFileSystem } from '../../client/common/platform/types';
-import { StartPage } from '../../client/common/startPage/startPage';
-import { ICodeCssGenerator, IStartPage, IThemeFinder, StartPageMessages } from '../../client/common/startPage/types';
-import {
- IConfigurationService,
- IExtensionContext,
- IOutputChannel,
- IPersistentState,
- IPersistentStateFactory,
-} from '../../client/common/types';
-import { IJupyterNotInstalledNotificationHelper, JupyterNotInstalledOrigin } from '../../client/jupyter/types';
-import { MockAutoSelectionService } from '../mocks/autoSelector';
-import * as Telemetry from '../../client/telemetry';
-import { EventName } from '../../client/telemetry/constants';
-import { JupyterNotInstalledNotificationHelper } from '../../client/jupyter/jupyterNotInstalledNotificationHelper';
-import { Jupyter } from '../../client/common/utils/localize';
-
-suite('StartPage tests', () => {
- let startPage: IStartPage;
- let provider: typemoq.IMock