Fix tests in ds/custom_editor branch

.vscode/launch.json

@@ -8,7 +8,9 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}"
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--enable-proposed-api",
+                "ms-python.python"
             ],
             "stopOnEntry": false,
             "smartStep": true,

src/client/common/insidersBuild/insidersExtensionService.ts

@@ -85,7 +85,10 @@ export class InsidersExtensionService implements IExtensionSingleActivationServi
      * @returns `true` if install channel is handled in these miscellaneous cases, `false` if install channel needs further handling
      */
     public async handleEdgeCases(installChannel: ExtensionChannels, isDefault: boolean): Promise<boolean> {
-        if (await this.promptToInstallInsidersIfApplicable(isDefault)) {
+        // When running UI Tests we might want to disable these prompts.
+        if (process.env.UITEST_DISABLE_INSIDERS) {
+            return true;
+        } else if (await this.promptToInstallInsidersIfApplicable(isDefault)) {
             return true;
         } else if (await this.setInsidersChannelToOffIfApplicable(installChannel)) {
             return true;

src/datascience-ui/native-editor/nativeCell.tsx

@@ -336,7 +336,7 @@ export class NativeCell extends React.Component<INativeCellProps> {
                 break;
             case 'z':
             case 'Z':
-                if (!this.isFocused() && !UseCustomEditor) {
+                if (!this.isFocused() && !UseCustomEditor.enabled) {
                     if (e.shiftKey && !e.ctrlKey && !e.altKey) {
                         e.stopPropagation();
                         this.props.redo();
@@ -637,7 +637,7 @@ export class NativeCell extends React.Component<INativeCellProps> {
                         keyDown={this.keyDownInput}
                         showLineNumbers={this.props.cellVM.showLineNumbers}
                         font={this.props.font}
-                        disableUndoStack={UseCustomEditor}
+                        disableUndoStack={UseCustomEditor.enabled}
                         codeVersion={this.props.cellVM.codeVersion ? this.props.cellVM.codeVersion : 1}
                         focusPending={this.props.focusPending}
                     />

src/datascience-ui/native-editor/nativeEditor.tsx

@@ -193,7 +193,7 @@ ${buildSettingsCss(this.props.settings)}`}</style>
             }
             case 'z':
             case 'Z':
-                if (!getSelectedAndFocusedInfo(this.props).focusedCellId && !UseCustomEditor) {
+                if (!getSelectedAndFocusedInfo(this.props).focusedCellId && !UseCustomEditor.enabled) {
                     if (event.shiftKey && !event.ctrlKey && !event.altKey) {
                         event.stopPropagation();
                         this.props.redo();

src/datascience-ui/react-common/constants.ts

@@ -24,4 +24,4 @@ export function getOSType() {
     }
 }
 
-export const UseCustomEditor = true;
+export const UseCustomEditor = { enabled: true };

src/test/common/insidersBuild/insidersExtensionService.unit.test.ts

@@ -106,7 +106,10 @@ suite('Insiders Extension Service - Activation', () => {
     let handleEdgeCases: sinon.SinonStub<any>;
     let insidersInstaller: IExtensionBuildInstaller;
     let insidersExtensionService: InsidersExtensionService;
+    let envUITEST_DISABLE_INSIDERSExists = false;
     setup(() => {
+        envUITEST_DISABLE_INSIDERSExists = process.env.UITEST_DISABLE_INSIDERS !== undefined;
+        delete process.env.UITEST_DISABLE_INSIDERS;
         extensionChannelService = mock(ExtensionChannelService);
         insidersInstaller = mock(InsidersBuildInstaller);
         appEnvironment = mock(ApplicationEnvironment);
@@ -119,6 +122,9 @@ suite('Insiders Extension Service - Activation', () => {
     });
 
     teardown(() => {
+        if (envUITEST_DISABLE_INSIDERSExists) {
+            process.env.UITEST_DISABLE_INSIDERS = '1';
+        }
         sinon.restore();
     });
 

src/test/datascience/interactive-ipynb/nativeEditorProvider.unit.test.ts

@@ -9,7 +9,7 @@ import { expect } from 'chai';
 import { anything, instance, mock, when } from 'ts-mockito';
 import * as typemoq from 'typemoq';
 import { EventEmitter, Uri, WebviewPanel } from 'vscode';
-import { ICustomEditorService, IWorkspaceService } from '../../../client/common/application/types';
+import { CustomDocument, ICustomEditorService, IWorkspaceService } from '../../../client/common/application/types';
 import { WorkspaceService } from '../../../client/common/application/workspace';
 import { AsyncDisposableRegistry } from '../../../client/common/asyncDisposableRegistry';
 import { ConfigurationService } from '../../../client/common/configuration/service';
@@ -65,10 +65,13 @@ suite('Data Science - Native Editor Provider', () => {
             .returns((_a1, _a2, _a3) => {
                 return { dispose: noop };
             });
+
         customEditorService
             .setup(c => c.openEditor(typemoq.It.isAny()))
             .returns(async f => {
-                return registeredProvider.resolveCustomEditor(f, panel.object);
+                const doc = typemoq.Mock.ofType<CustomDocument>();
+                doc.setup(d => d.uri).returns(() => f);
+                return registeredProvider.resolveCustomEditor(doc.object, panel.object);
             });
 
         editor

src/test/datascience/nativeEditor.functional.test.tsx

@@ -36,6 +36,7 @@ import { ExecutionCount } from '../../datascience-ui/interactive-common/executio
 import { CommonActionType } from '../../datascience-ui/interactive-common/redux/reducers/types';
 import { NativeCell } from '../../datascience-ui/native-editor/nativeCell';
 import { NativeEditor } from '../../datascience-ui/native-editor/nativeEditor';
+import { UseCustomEditor } from '../../datascience-ui/react-common/constants';
 import { IKeyboardEvent } from '../../datascience-ui/react-common/event';
 import { ImageButton } from '../../datascience-ui/react-common/imageButton';
 import { IMonacoEditorState, MonacoEditor } from '../../datascience-ui/react-common/monacoEditor';
@@ -127,6 +128,7 @@ suite('DataScience Native Editor', () => {
                 };
 
                 setup(async () => {
+                    UseCustomEditor.enabled = useCustomEditorApi;
                     ioc = new DataScienceIocContainer();
                     ioc.registerDataScienceTypes(useCustomEditorApi);
 
@@ -899,6 +901,7 @@ df.head()`;
                     cleanupCallback: Function;
                 };
                 function initIoc() {
+                    UseCustomEditor.enabled = useCustomEditorApi;
                     ioc = new DataScienceIocContainer();
                     ioc.registerDataScienceTypes(useCustomEditorApi);
                 }

src/test/debuggerTest.ts

@@ -18,7 +18,8 @@ function start() {
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
         launchArgs: [workspacePath],
-        version: 'insiders'
+        version: 'insiders',
+        extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
     }).catch(ex => {
         console.error('End Debugger tests (with errors)', ex);
         process.exit(1);

src/test/multiRootTest.ts

@@ -13,8 +13,9 @@ function start() {
     runTests({
         extensionDevelopmentPath: EXTENSION_ROOT_DIR_FOR_TESTS,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
-        launchArgs: [workspacePath],
-        version: 'stable'
+        launchArgs: [workspacePath, '--enable-proposed-api', 'ms-python.python'],
+        version: 'insiders',
+        extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
     }).catch(ex => {
         console.error('End Multiroot tests (with errors)', ex);
         process.exit(1);

src/test/standardTest.ts

@@ -19,8 +19,9 @@ function start() {
     runTests({
         extensionDevelopmentPath: extensionDevelopmentPath,
         extensionTestsPath: path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'out', 'test', 'index'),
-        launchArgs: [workspacePath],
-        version: 'stable'
+        launchArgs: [workspacePath, '--enable-proposed-api', 'ms-python.python'],
+        version: 'insiders',
+        extensionTestsEnv: { ...process.env, UITEST_DISABLE_INSIDERS: '1' }
     }).catch(ex => {
         console.error('End Standard tests (with errors)', ex);
         process.exit(1);