Reenable a couple notebook smoketests (microsoft#159521)

roblourens · web-flow · commit a77501f8fc52 · 2022-09-14T13:22:16.000-07:00
* Remove vscode-notebook-tests in favor of an .ipynb in vscode-smoketest-express

* Update build folder

* Add build task to correct platform

* Build for smoke tests on other platforms

* Fix repo url and remove comment

* Just -media?

* Update darwin/win32 as well
diff --git a/automation/src/code.ts b/automation/src/code.ts
@@ -3,19 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { join } from 'path';
-import * as os from 'os';
 import * as cp from 'child_process';
-import { IElement, ILocalizedStrings, ILocaleInfo } from './driver';
+import * as os from 'os';
+import * as treekill from 'tree-kill';
+import { IElement, ILocaleInfo, ILocalizedStrings } from './driver';
+import { Logger, measureAndLog } from './logger';
 import { launch as launchPlaywrightBrowser } from './playwrightBrowser';
+import { PlaywrightDriver } from './playwrightDriver';
 import { launch as launchPlaywrightElectron } from './playwrightElectron';
-import { Logger, measureAndLog } from './logger';
-import { copyExtension } from './extensions';
-import * as treekill from 'tree-kill';
 import { teardown } from './processes';
-import { PlaywrightDriver } from './playwrightDriver';
-
-const rootPath = join(__dirname, '../../..');
 
 export interface LaunchOptions {
 	codePath?: string;
@@ -76,8 +72,6 @@ export async function launch(options: LaunchOptions): Promise<Code> {
 		throw new Error('Smoke test process has terminated, refusing to spawn Code');
 	}
 
-	await measureAndLog(() => copyExtension(rootPath, options.extensionsPath, 'vscode-notebook-tests'), 'copyExtension(vscode-notebook-tests)', options.logger);
-
 	// Browser smoke tests
 	if (options.web) {
 		const { serverProcess, driver } = await measureAndLog(() => launchPlaywrightBrowser(options), 'launch playwright (browser)', options.logger);
diff --git a/automation/src/electron.ts b/automation/src/electron.ts
@@ -61,22 +61,13 @@ export async function resolveElectronConfiguration(options: LaunchOptions): Prom
 		const remoteDataDir = `${userDataDir}-server`;
 		mkdirp.sync(remoteDataDir);
 
-		if (codePath) {
-			// running against a build: copy the test resolver extension into remote extensions dir
-			const remoteExtensionsDir = join(remoteDataDir, 'extensions');
-			mkdirp.sync(remoteExtensionsDir);
-			await measureAndLog(() => copyExtension(root, remoteExtensionsDir, 'vscode-notebook-tests'), 'copyExtension(vscode-notebook-tests)', logger);
-		}
-
 		env['TESTRESOLVER_DATA_FOLDER'] = remoteDataDir;
 		env['TESTRESOLVER_LOGS_FOLDER'] = join(logsPath, 'server');
 		if (options.verbose) {
 			env['TESTRESOLVER_LOG_LEVEL'] = 'trace';
 		}
 	}
 
-	args.push('--enable-proposed-api=vscode.vscode-notebook-tests');
-
 	if (!codePath) {
 		args.unshift(root);
 	}
diff --git a/automation/src/notebook.ts b/automation/src/notebook.ts
@@ -5,18 +5,22 @@
 
 import { Code } from './code';
 import { QuickAccess } from './quickaccess';
+import { QuickInput } from './quickinput';
 
 const activeRowSelector = `.notebook-editor .monaco-list-row.focused`;
 
 export class Notebook {
 
 	constructor(
 		private readonly quickAccess: QuickAccess,
+		private readonly quickInput: QuickInput,
 		private readonly code: Code) {
 	}
 
 	async openNotebook() {
-		await this.quickAccess.runCommand('vscode-notebook-tests.createNewNotebook');
+		await this.quickAccess.openFileQuickAccessAndWait('notebook.ipynb', 1);
+		await this.quickInput.selectQuickInputElement(0);
+
 		await this.code.waitForElement(activeRowSelector);
 		await this.focusFirstCell();
 		await this.waitForActiveCellEditorContents('code()');
diff --git a/automation/src/workbench.ts b/automation/src/workbench.ts
@@ -64,7 +64,7 @@ export class Workbench {
 		this.settingsEditor = new SettingsEditor(code, this.editors, this.editor, this.quickaccess);
 		this.keybindingsEditor = new KeybindingsEditor(code);
 		this.terminal = new Terminal(code, this.quickaccess, this.quickinput);
-		this.notebook = new Notebook(this.quickaccess, code);
+		this.notebook = new Notebook(this.quickaccess, this.quickinput, code);
 		this.localization = new Localization(code);
 		this.task = new Task(code, this.editor, this.editors, this.quickaccess, this.quickinput, this.terminal);
 	}
diff --git a/smoke/src/areas/notebook/notebook.test.ts b/smoke/src/areas/notebook/notebook.test.ts
@@ -8,7 +8,7 @@ import { Application, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
-	describe.skip('Notebooks', () => { // TODO@rebornix https://github.com/microsoft/vscode/issues/140575
+	describe('Notebooks', () => {
 
 		// Shared before/after handling
 		installAllHandlers(logger);
@@ -25,7 +25,7 @@ export function setup(logger: Logger) {
 			cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
 		});
 
-		it.skip('inserts/edits code cell', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/139672
+		it('inserts/edits code cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.focusNextCell();
@@ -34,7 +34,7 @@ export function setup(logger: Logger) {
 			await app.workbench.notebook.stopEditingCell();
 		});
 
-		it.skip('inserts/edits markdown cell', async function () {
+		it('inserts/edits markdown cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.focusNextCell();

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class Workbench {`
`64`	`64`	`this.settingsEditor = new SettingsEditor(code, this.editors, this.editor, this.quickaccess);`
`65`	`65`	`this.keybindingsEditor = new KeybindingsEditor(code);`
`66`	`66`	`this.terminal = new Terminal(code, this.quickaccess, this.quickinput);`
`67`		`- this.notebook = new Notebook(this.quickaccess, code);`
	`67`	`+ this.notebook = new Notebook(this.quickaccess, this.quickinput, code);`
`68`	`68`	`this.localization = new Localization(code);`
`69`	`69`	`this.task = new Task(code, this.editor, this.editors, this.quickaccess, this.quickinput, this.terminal);`
`70`	`70`	`}`