Merge from vscode 1fbacccbc900bb59ba8a8f26a4128d48a1c97842

test/automation/src/application.ts

@@ -133,8 +133,7 @@ export class Application {
 			extraArgs,
 			remote: this.options.remote,
 			web: this.options.web,
-			browser: this.options.browser,
-			headless: this.options.headless
+			browser: this.options.browser
 		});
 
 		this._workbench = new Workbench(this._code, this.userDataPath);

test/automation/src/code.ts

@@ -103,8 +103,6 @@ export interface SpawnOptions {
 	web?: boolean;
 	/** A specific browser to use (requires web: true) */
 	browser?: 'chromium' | 'webkit' | 'firefox';
-	/** Run in headless mode (only applies when web is true) */
-	headless?: boolean;
 }
 
 async function createDriverHandle(): Promise<string> {
@@ -127,7 +125,7 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 
 	if (options.web) {
 		await launch(options.userDataDir, options.workspacePath, options.codePath);
-		connectDriver = connectPlaywrightDriver.bind(connectPlaywrightDriver, !!options.headless, options.browser);
+		connectDriver = connectPlaywrightDriver.bind(connectPlaywrightDriver, options.browser);
 	} else {
 		const env = process.env;
 

test/automation/src/playwrightDriver.ts

@@ -137,12 +137,11 @@ function waitForEndpoint(): Promise<string> {
 	});
 }
 
-export function connect(headless: boolean, engine: 'chromium' | 'webkit' | 'firefox' = 'chromium'): Promise<{ client: IDisposable, driver: IDriver }> {
+export function connect(engine: 'chromium' | 'webkit' | 'firefox' = 'chromium'): Promise<{ client: IDisposable, driver: IDriver }> {
 	return new Promise(async (c) => {
 		const browser = await playwright[engine].launch({
 			// Run in Edge dev on macOS
-			// executablePath: '/Applications/Microsoft\ Edge\ Dev.app/Contents/MacOS/Microsoft\ Edge\ Dev',
-			headless
+			// executablePath: '/Applications/Microsoft\ Edge\ Dev.app/Contents/MacOS/Microsoft\ Edge\ Dev'
 		});
 		const page = (await browser.defaultContext().pages())[0];
 		await page.setViewport({ width, height });

test/integration/browser/README.md

@@ -14,6 +14,8 @@ All integration tests run in an Electron instance. You can specify to run the te
 
 ## Run (inside browser)
 
-	resources/server/test/test-web-integration.[sh|bat] --browser [chromium|webkit]
+	resources/server/test/test-web-integration.[sh|bat] --browser [chromium|webkit] [--debug]
 
 All integration tests run in a browser instance as specified by the command line arguments.
+
+Add the `--debug` flag to see a browser window with the tests running.

test/integration/browser/src/index.ts

@@ -29,7 +29,8 @@ const width = 1200;
 const height = 800;
 
 async function runTestsInBrowser(browserType: string, endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
-	const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug) });
+	const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
+	const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug), dumpio: true, args });
 	const page = (await browser.defaultContext().pages())[0];
 	await page.setViewport({ width, height });
 

test/smoke/src/areas/explorer/explorer.test.ts

@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Application } from '../../../../automation';
-
-export function setup() {
-	describe('Explorer', () => {
-		it('quick open search produces correct result', async function () {
-			const app = this.app as Application;
-			const expectedNames = [
-				'.eslintrc.json',
-				'tasks.json',
-				'app.js',
-				'index.js',
-				'users.js',
-				'package.json',
-				'jsconfig.json'
-			];
-
-			await app.workbench.quickopen.openQuickOpen('.js');
-			await app.workbench.quickopen.waitForQuickOpenElements(names => expectedNames.every(n => names.some(m => n === m)));
-			await app.code.dispatchKeybinding('escape');
-		});
-
-		it('quick open respects fuzzy matching', async function () {
-			const app = this.app as Application;
-			const expectedNames = [
-				'tasks.json',
-				'app.js',
-				'package.json'
-			];
-
-			await app.workbench.quickopen.openQuickOpen('a.s');
-			await app.workbench.quickopen.waitForQuickOpenElements(names => expectedNames.every(n => names.some(m => n === m)));
-			await app.code.dispatchKeybinding('escape');
-		});
-	});
-}

test/smoke/src/areas/search/search.test.ts

@@ -56,4 +56,36 @@ export function setup() {
 			await app.workbench.search.waitForNoResultText();
 		});
 	});
+
+	describe('Quick Open', () => {
+		it('quick open search produces correct result', async function () {
+			const app = this.app as Application;
+			const expectedNames = [
+				'.eslintrc.json',
+				'tasks.json',
+				'app.js',
+				'index.js',
+				'users.js',
+				'package.json',
+				'jsconfig.json'
+			];
+
+			await app.workbench.quickopen.openQuickOpen('.js');
+			await app.workbench.quickopen.waitForQuickOpenElements(names => expectedNames.every(n => names.some(m => n === m)));
+			await app.code.dispatchKeybinding('escape');
+		});
+
+		it('quick open respects fuzzy matching', async function () {
+			const app = this.app as Application;
+			const expectedNames = [
+				'tasks.json',
+				'app.js',
+				'package.json'
+			];
+
+			await app.workbench.quickopen.openQuickOpen('a.s');
+			await app.workbench.quickopen.waitForQuickOpenElements(names => expectedNames.every(n => names.some(m => n === m)));
+			await app.code.dispatchKeybinding('escape');
+		});
+	});
 }

test/smoke/src/main.ts

@@ -29,7 +29,6 @@ import { setup as runQueryEditorTests } from './sql/queryEditor/queryEditor.test
 /*
 import { setup as setupDataMigrationTests } from './areas/workbench/data-migration.test';
 import { setup as setupDataLossTests } from './areas/workbench/data-loss.test';
-import { setup as setupDataExplorerTests } from './areas/explorer/explorer.test';
 import { setup as setupDataPreferencesTests } from './areas/preferences/preferences.test';
 import { setup as setupDataSearchTests } from './areas/search/search.test';
 import { setup as setupDataCSSTests } from './areas/css/css.test';
@@ -65,7 +64,6 @@ const opts = minimist(args, {
 		'verbose',
 		'remote',
 		'web',
-		'headless',
 		'ci'
 	],
 	default: {
@@ -253,8 +251,7 @@ function createOptions(): ApplicationOptions {
 		screenshotsPath,
 		remote: opts.remote,
 		web: opts.web,
-		browser: opts.browser,
-		headless: opts.headless
+		browser: opts.browser
 	};
 }
 
@@ -331,7 +328,6 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	else {
 		/*if (!opts.web) { setupDataMigrationTests(opts['stable-build'], testDataPath); } {{SQL CARBON EDIT}} comment out tests
 		if (!opts.web) { setupDataLossTests(); }
-		setupDataExplorerTests();
 		if (!opts.web) { setupDataPreferencesTests(); }
 		setupDataSearchTests();
 		setupDataCSSTests();

test/unit/browser/index.js

@@ -118,8 +118,8 @@ const testModules = (async function () {
 
 
 async function runTestsInBrowser(testModules, browserType) {
-
-	const browser = await playwright[browserType].launch({ headless: !Boolean(argv.debug) });
+	const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
+	const browser = await playwright[browserType].launch({ headless: !Boolean(argv.debug), dumpio: true, args });
 	const page = (await browser.defaultContext().pages())[0]
 	const target = url.pathToFileURL(path.join(__dirname, 'renderer.html'));
 	if (argv.build) {