Add explorer and terminal smoke tests

Author: jeanp413

package.json

@@ -36,7 +36,6 @@
     "update-localization-extension": "node build/npm/update-localization-extension.js",
     "smoketest": "cd test/smoke && yarn compile && node test/index.js",
     "smoketest-no-compile": "cd test/smoke && node test/index.js",
-    "smoketest-gitpod": "cd test/smoke && node test/index.js --web --verbose --test-repo /workspace/vscode-smoketest-express --headless --screenshots /workspace/screenshots --electronArgs=\"--disable-dev-shm-usage --use-gl=swiftshader\"",
     "download-builtin-extensions": "node build/lib/builtInExtensions.js",
     "download-builtin-extensions-cg": "node build/lib/builtInExtensionsCG.js",
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",

resources/server/web.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env sh
 ROOT=$(dirname $(dirname "$(dirname "$0")"))
 
-# APP_NAME="gitpodcode"
-# VERSION="1.59.1"
-# COMMIT="3866c3553be8b268c8a7f8c0482c0c0177aa8bfa"
-# EXEC_NAME="code"
-CLI_SCRIPT="$ROOT/out/server.js"
-#"node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "$@"
-"node" "$CLI_SCRIPT" "$@"
+SERVER_SCRIPT="$ROOT/out/server.js"
+node "$SERVER_SCRIPT" "$@"

src/vs/platform/driver/browser/baseDriver.ts

@@ -140,8 +140,8 @@ export abstract class BaseWindowDriver implements IWindowDriver {
 
 		const lines: string[] = [];
 
-		for (let i = 0; i < xterm.buffer.length; i++) {
-			lines.push(xterm.buffer.getLine(i)!.translateToString(true));
+		for (let i = 0; i < xterm.buffer.active.length; i++) {
+			lines.push(xterm.buffer.active.getLine(i)!.translateToString(true));
 		}
 
 		return lines;

test/automation/src/playwrightDriver.ts

@@ -81,10 +81,7 @@ function buildDriver(browser: playwright.Browser, context: playwright.BrowserCon
 			await page.mouse.click(x + (xoffset ? xoffset : 0), y + (yoffset ? yoffset : 0));
 		},
 		doubleClick: async (windowId, selector) => {
-			await driver.click(windowId, selector, 0, 0);
-			await timeout(60);
-			await driver.click(windowId, selector, 0, 0);
-			await timeout(100);
+			await page.dblclick(selector, { delay: 70 });
 		},
 		setValue: async (windowId, selector, text) => page.evaluate(`window.driver.setValue('${selector}', '${text}')`).then(undefined),
 		getTitle: (windowId) => page.evaluate(`window.driver.getTitle()`),

test/automation/src/terminal.ts

@@ -6,7 +6,7 @@
 import { Code } from './code';
 import { QuickAccess } from './quickaccess';
 
-const PANEL_SELECTOR = 'div[id="workbench.panel.terminal"]';
+const PANEL_SELECTOR = 'div[id="workbench.parts.panel"]';
 const XTERM_SELECTOR = `${PANEL_SELECTOR} .terminal-wrapper`;
 const XTERM_TEXTAREA = `${XTERM_SELECTOR} textarea.xterm-helper-textarea`;
 

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

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import minimist = require('minimist');
+import { Application } from '../../../../automation';
+import { afterSuite, beforeSuite } from '../../utils';
+
+export function setup(opts: minimist.ParsedArgs) {
+	describe('Explorer', () => {
+		beforeSuite(opts);
+
+		afterSuite(opts);
+
+		it('shows explorer and opens a file', async function () {
+			const app = this.app as Application;
+			await app.workbench.explorer.openExplorerView();
+			await app.workbench.explorer.openFile('app.js');
+		});
+	});
+}

test/smoke/src/areas/terminal/terminal.test.ts

@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import minimist = require('minimist');
+import { Application } from '../../../../automation';
+import { afterSuite, beforeSuite } from '../../utils';
+
+export function setup(opts: minimist.ParsedArgs) {
+	describe('Terminal', () => {
+		beforeSuite(opts);
+
+		afterSuite(opts);
+
+		it('shows terminal and runs command', async function () {
+			const app = this.app as Application;
+			await app.workbench.terminal.showTerminal();
+			await app.workbench.terminal.runCommand('ls');
+			await app.workbench.terminal.waitForTerminalText(lines => lines.some(l => l.includes('app.js')));
+		});
+	});
+}

test/smoke/src/main.ts

@@ -27,6 +27,8 @@ import { setup as setupDataExtensionTests } from './areas/extensions/extensions.
 import { setup as setupDataMultirootTests } from './areas/multiroot/multiroot.test';
 import { setup as setupDataLocalizationTests } from './areas/workbench/localization.test';
 import { setup as setupLaunchTests } from './areas/workbench/launch.test';
+import { setup as setupDataExplorerTests } from './areas/explorer/explorer.test';
+import { setup as setupDataTerminalTests } from './areas/terminal/terminal.test';
 
 const testDataPath = path.join(os.tmpdir(), 'vscsmoke');
 if (fs.existsSync(testDataPath)) {
@@ -343,12 +345,14 @@ if (!opts.web && opts['build'] && !opts['remote']) {
 describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	if (!opts.web) { setupDataLossTests(opts); }
 	if (!opts.web) { setupDataPreferencesTests(opts); }
+	setupDataExplorerTests(opts);
 	setupDataSearchTests(opts);
 	setupDataNotebookTests(opts);
 	setupDataLanguagesTests(opts);
 	setupDataEditorTests(opts);
 	setupDataStatusbarTests(opts);
 	setupDataExtensionTests(opts);
+	setupDataTerminalTests(opts);
 	if (!opts.web) { setupDataMultirootTests(opts); }
 	if (!opts.web) { setupDataLocalizationTests(opts); }
 	if (!opts.web) { setupLaunchTests(); }