diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts index 0b2bbedee05..71efdf34059 100644 --- a/test/automation/src/application.ts +++ b/test/automation/src/application.ts @@ -6,7 +6,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { Workbench } from './workbench'; -import { Code, spawn, SpawnOptions } from './code'; +import { Code, launch, LaunchOptions } from './code'; import { Logger, measureAndLog } from './logger'; export const enum Quality { @@ -15,7 +15,7 @@ export const enum Quality { Stable } -export interface ApplicationOptions extends SpawnOptions { +export interface ApplicationOptions extends LaunchOptions { quality: Quality; workspacePath: string; waitTime: number; @@ -112,7 +112,7 @@ export class Application { } private async startApplication(extraArgs: string[] = []): Promise { - const code = this._code = await spawn({ + const code = this._code = await launch({ ...this.options, extraArgs: [...(this.options.extraArgs || []), ...extraArgs], }); diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts index ac138b770de..c2c85b2a263 100644 --- a/test/automation/src/code.ts +++ b/test/automation/src/code.ts @@ -14,7 +14,7 @@ import { copyExtension } from './extensions'; const repoPath = path.join(__dirname, '../../..'); -export interface SpawnOptions { +export interface LaunchOptions { codePath?: string; workspacePath: string; userDataDir: string; @@ -26,7 +26,6 @@ export interface SpawnOptions { web?: boolean; headless?: boolean; browser?: 'chromium' | 'webkit' | 'firefox'; - testTitle?: string; } let stopped = false; @@ -34,7 +33,7 @@ process.on('exit', () => stopped = true); process.on('SIGINT', () => stopped = true); process.on('SIGTERM', () => stopped = true); -export async function spawn(options: SpawnOptions): Promise { +export async function launch(options: LaunchOptions): Promise { if (stopped) { throw new Error('Smoke test process has terminated, refusing to spawn Code'); } @@ -43,22 +42,12 @@ export async function spawn(options: SpawnOptions): Promise { // Browser smoke tests if (options.web) { - return spawnBrowser(options); + const { serverProcess, client, driver } = await launchPlaywright(options); + return new Code(client, driver, options.logger, serverProcess); } // Electron smoke tests - return spawnElectron(options); -} - -async function spawnBrowser(options: SpawnOptions): Promise { - const { serverProcess, client, driver } = await launchPlaywright(options.codePath, options.userDataDir, options.extensionsPath, options.workspacePath, Boolean(options.verbose), options, options.logger); - - return new Code(client, driver, options.logger, serverProcess); -} - -async function spawnElectron(options: SpawnOptions): Promise { - const { electronProcess, client, driver } = await launchElectron(options.codePath, options.userDataDir, options.extensionsPath, options.workspacePath, Boolean(options.verbose), Boolean(options.remote), options.extraArgs, options.logger); - + const { electronProcess, client, driver } = await launchElectron(options); return new Code(client, driver, options.logger, electronProcess); } @@ -110,7 +99,7 @@ export class Code { private readonly mainProcess: cp.ChildProcess ) { this.driver = new Proxy(driver, { - get(target, prop, receiver) { + get(target, prop) { if (typeof prop === 'symbol') { throw new Error('Invalid usage'); } diff --git a/test/automation/src/electronDriver.ts b/test/automation/src/electronDriver.ts index 823b4f0fb42..fdbac5d6f53 100644 --- a/test/automation/src/electronDriver.ts +++ b/test/automation/src/electronDriver.ts @@ -13,11 +13,13 @@ import { promisify } from 'util'; import * as kill from 'tree-kill'; import { copyExtension } from './extensions'; import { URI } from 'vscode-uri'; -import { Logger, measureAndLog } from './logger'; +import { measureAndLog } from './logger'; +import type { LaunchOptions } from './code'; const repoPath = path.join(__dirname, '../../..'); -export async function launch(codePath: string | undefined, userDataDir: string, extensionsPath: string, workspacePath: string, verbose: boolean, remote: boolean, extraArgs: string[] | undefined, logger: Logger): Promise<{ electronProcess: ChildProcess, client: IDisposable, driver: IDriver }> { +export async function launch(options: LaunchOptions): Promise<{ electronProcess: ChildProcess, client: IDisposable, driver: IDriver }> { + const { codePath, workspacePath, extensionsPath, userDataDir, remote, logger, verbose, extraArgs } = options; const env = { ...process.env }; const logsPath = path.join(repoPath, '.build', 'logs', remote ? 'smoke-tests-remote' : 'smoke-tests'); const outPath = codePath ? getBuildOutPath(codePath) : getDevOutPath(); diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts index d85f2b9cfe1..c137bb22486 100644 --- a/test/automation/src/playwrightDriver.ts +++ b/test/automation/src/playwrightDriver.ts @@ -13,6 +13,7 @@ import { URI } from 'vscode-uri'; import * as kill from 'tree-kill'; import { PageFunction } from 'playwright-core/types/structs'; import { Logger, measureAndLog } from './logger'; +import type { LaunchOptions } from './code'; const width = 1200; const height = 800; @@ -198,29 +199,26 @@ class PlaywrightDriver implements IDriver { let port = 9000; -export interface PlaywrightOptions { - readonly browser?: 'chromium' | 'webkit' | 'firefox'; - readonly headless?: boolean; -} - -export async function launch(codeServerPath = process.env.VSCODE_REMOTE_SERVER_PATH, userDataDir: string, extensionsPath: string, workspacePath: string, verbose: boolean, options: PlaywrightOptions = {}, logger: Logger): Promise<{ serverProcess: ChildProcess, client: IDisposable, driver: IDriver }> { +export async function launch(options: LaunchOptions): Promise<{ serverProcess: ChildProcess, client: IDisposable, driver: IDriver }> { // Launch server - const { serverProcess, endpoint } = await launchServer(userDataDir, codeServerPath, extensionsPath, verbose, logger); + const { serverProcess, endpoint } = await launchServer(options); // Launch browser - const { browser, context, page } = await launchBrowser(options, endpoint, workspacePath, logger); + const { browser, context, page } = await launchBrowser(options, endpoint); return { serverProcess, client: { dispose: () => { /* there is no client to dispose for browser, teardown is triggered via exitApplication call */ } }, - driver: new PlaywrightDriver(serverProcess, browser, context, page, logger) + driver: new PlaywrightDriver(serverProcess, browser, context, page, options.logger) }; } -async function launchServer(userDataDir: string, codeServerPath: string | undefined, extensionsPath: string, verbose: boolean, logger: Logger) { +async function launchServer(options: LaunchOptions) { + const { userDataDir, codePath, extensionsPath, verbose, logger } = options; + const codeServerPath = codePath ?? process.env.VSCODE_REMOTE_SERVER_PATH; const agentFolder = userDataDir; await measureAndLog(promisify(mkdir)(agentFolder), `mkdir(${agentFolder})`, logger); const env = { @@ -274,7 +272,8 @@ async function launchServer(userDataDir: string, codeServerPath: string | undefi }; } -async function launchBrowser(options: PlaywrightOptions, endpoint: string, workspacePath: string, logger: Logger) { +async function launchBrowser(options: LaunchOptions, endpoint: string) { + const { logger, workspacePath } = options; const browser = await measureAndLog(playwright[options.browser ?? 'chromium'].launch({ headless: options.headless ?? false }), 'playwright#launch', logger); const context = await measureAndLog(browser.newContext(), 'browser.newContext', logger); diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts index 34c27d39024..a949894a2e3 100644 --- a/test/smoke/src/areas/search/search.test.ts +++ b/test/smoke/src/areas/search/search.test.ts @@ -73,12 +73,12 @@ export function setup(opts: minimist.ParsedArgs) { }); }); - describe('Quick Access', () => { + describe('Quick Open', () => { // Shared before/after handling installCommonTestHandlers(opts); - it('quick access search produces correct result', async function () { + it('quick open search produces correct result', async function () { const app = this.app as Application; const expectedNames = [ '.eslintrc.json', @@ -95,7 +95,7 @@ export function setup(opts: minimist.ParsedArgs) { await app.code.dispatchKeybinding('escape'); }); - it('quick access respects fuzzy matching', async function () { + it('quick open respects fuzzy matching', async function () { const app = this.app as Application; const expectedNames = [ 'tasks.json',