Smoke test running

Author: jeanp413

package.json

@@ -36,6 +36,7 @@
     "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

@@ -0,0 +1,10 @@
+#!/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" "$@"

src/vs/server/browser/workbench/workbench.ts

@@ -7,13 +7,13 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { request } from 'vs/base/parts/request/browser/request';
 import { localize } from 'vs/nls';
 import { parseLogLevel } from 'vs/platform/log/common/log';
 import { defaultWebSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
 import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/windows/common/windows';
-import { create, ICredentialsProvider, IHomeIndicator, IProductQualityChangeHandler, IWindowIndicator, IWorkspace, IWorkspaceProvider } from 'vs/workbench/workbench.web.api';
+import { create, ICredentialsProvider, IHomeIndicator, IProductQualityChangeHandler, IWindowIndicator, IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/workbench.web.api';
 
 function doCreateUri(path: string, queryValues: Map<string, string>): URI {
 	let query: string | undefined = undefined;
@@ -296,6 +296,15 @@ class WindowIndicator implements IWindowIndicator {
 
 
 (function () {
+	// Find config by checking for DOM
+	const configElement = document.getElementById('vscode-workbench-web-configuration');
+	const configElementAttribute = configElement ? configElement.getAttribute('data-settings') : undefined;
+	if (!configElement || !configElementAttribute) {
+		throw new Error('Missing web configuration element');
+	}
+
+	const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
+
 	// Find workspace to open and payload
 	let workspace: IWorkspace;
 	let payload = Object.create(null);
@@ -399,7 +408,8 @@ class WindowIndicator implements IWindowIndicator {
 			});
 		},
 		developmentOptions: {
-			logLevel: logLevel ? parseLogLevel(logLevel) : undefined
+			logLevel: logLevel ? parseLogLevel(logLevel) : undefined,
+			...config.developmentOptions
 		},
 		homeIndicator,
 		windowIndicator,

src/vs/server/node/server.main.ts

@@ -169,6 +169,11 @@ function getMediaMime(forPath: string): string | undefined {
 	return mapExtToMediaMimes.get(ext.toLowerCase());
 }
 
+function serveError(req: http.IncomingMessage, res: http.ServerResponse, errorCode: number, errorMessage: string): void {
+	res.writeHead(errorCode, { 'Content-Type': 'text/plain' });
+	res.end(errorMessage);
+}
+
 async function serveFile(logService: ILogService, req: http.IncomingMessage, res: http.ServerResponse, filePath: string, responseHeaders: http.OutgoingHttpHeaders = {}) {
 	try {
 
@@ -199,9 +204,29 @@ async function serveFile(logService: ILogService, req: http.IncomingMessage, res
 	}
 }
 
-function serveError(req: http.IncomingMessage, res: http.ServerResponse, errorCode: number, errorMessage: string): void {
-	res.writeHead(errorCode, { 'Content-Type': 'text/plain' });
-	res.end(errorMessage);
+async function handleRoot(req: http.IncomingMessage, resp: http.ServerResponse, entryPointPath: string, environmentService: INativeEnvironmentService) {
+	if (!req.headers.host) {
+		return serveError(req, resp, 400, 'Bad request.');
+	}
+
+	const host = req.headers.host;
+
+	const workbenchConfig = {
+		remoteAuthority: host,
+		developmentOptions: {
+			enableSmokeTestDriver: environmentService.driverHandle === 'web' ? true : undefined
+		}
+	};
+
+	const escapeQuote = (str: string) => str.replace(/"/g, '"');
+	const entryPointContent = (await fs.promises.readFile(entryPointPath))
+		.toString()
+		.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeQuote(JSON.stringify(workbenchConfig)));
+
+	resp.writeHead(200, {
+		'Content-Type': 'text/html'
+	});
+	return resp.end(entryPointContent);
 }
 
 interface ServerParsedArgs extends NativeParsedArgs {
@@ -558,6 +583,8 @@ export async function main(options: IServerOptions): Promise<void> {
 		const requestService = accessor.get(IRequestService);
 		channelServer.registerChannel('request', new RequestChannel(requestService));
 
+		const environmentService = accessor.get(INativeEnvironmentService);
+
 		// Delay creation of spdlog for perf reasons (https://github.com/microsoft/vscode/issues/72906)
 		bufferLogService.logger = new SpdLogLogger('main', join(environmentService.logsPath, `${RemoteExtensionLogFileName}.log`), true, bufferLogService.getLevel());
 
@@ -588,7 +615,7 @@ export async function main(options: IServerOptions): Promise<void> {
 
 				//#region static
 				if (pathname === '/') {
-					return serveFile(logService, req, res, devMode ? options.mainDev || WEB_MAIN_DEV : options.main || WEB_MAIN);
+					return handleRoot(req, res, devMode ? options.mainDev || WEB_MAIN_DEV : options.main || WEB_MAIN, environmentService);
 				}
 				if (pathname === '/manifest.json') {
 					res.writeHead(200, { 'Content-Type': 'application/json' });
@@ -906,7 +933,7 @@ export async function main(options: IServerOptions): Promise<void> {
 		}
 		server.listen(port, '0.0.0.0', () => {
 			const { address, port } = server.address() as net.AddressInfo;
-			logService.info(`Web UI available at           https://${address}:${port}`);
+			logService.info(`Web UI available at http://${address}:${port}`);
 		});
 	});
 }

test/automation/src/playwrightDriver.ts

@@ -40,7 +40,7 @@ function buildDriver(browser: playwright.Browser, context: playwright.BrowserCon
 		getWindowIds: () => {
 			return Promise.resolve([1]);
 		},
-		capturePage: () => Promise.resolve(''),
+		capturePage: () => page.screenshot().then(buffer => buffer.toString('base64')),
 		reloadWindow: (windowId) => Promise.resolve(),
 		exitApplication: async () => {
 			try {
@@ -206,7 +206,8 @@ export function connect(options: Options = {}): Promise<{ client: IDisposable, d
 			}
 		});
 		const payloadParam = `[["enableProposedApi",""],["skipWelcome","true"]]`;
-		await page.goto(`${endpoint}&folder=vscode-remote://localhost:9888${URI.file(workspacePath!).path}&payload=${payloadParam}`);
+		const match = /http:\/\/(.*)/.exec(endpoint!);
+		await page.goto(`${endpoint}/?folder=vscode-remote://${match![1]}${URI.file(workspacePath!).path}&payload=${payloadParam}`);
 		const result = {
 			client: {
 				dispose: () => {