maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Launch server from tests

Browse source
This commit is contained in:
Daniel Imms 2019-08-13 11:19:14 -07:00
parent 8f1c14f737
commit 064e134c6c
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/smoke/src/vscode/code.ts
View file

@ -173,7 +173,7 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
let connectDriver: typeof connectElectronDriver;
if (options.web) {
launch(args);
await launch(args);
connectDriver = connectPuppeteerDriver.bind(connectPuppeteerDriver, !!options.headless);
} else {
const spawnOptions: cp.SpawnOptions = { env };

29
test/smoke/src/vscode/puppeteerDriver.ts
View file

@ -4,6 +4,9 @@
*--------------------------------------------------------------------------------------------*/
import * as puppeteer from 'puppeteer';
import { ChildProcess, spawn } from 'child_process';
import { join } from 'path';
import { Readable } from 'stream';
const width = 1200;
const height = 800;
@ -177,10 +180,23 @@ function timeout(ms: number): Promise<void> {
// function runInDriver(call: string, args: (string | boolean)[]): Promise<any> {}
let args;
let server: ChildProcess;
let endpoint: string | undefined;
export function launch(_args): void {
export async function launch(_args): Promise<void> {
args = _args;
// TODO: Move puppeteer launch here
console.log('launch args', args);
// TODO: --web-user-data-dir (tmpdir)
server = spawn(join(args[0], '/resources/server/web.sh'), ['--driver', 'web']);
endpoint = await new Promise<string>(r => {
server.stdout.on('data', d => {
const matches = d.toString('ascii').match(/Web UI available at (.+)/);
if (matches !== null) {
r(matches[1]);
}
});
});
}
export function connect(headless: boolean, outPath: string, handle: string): Promise<{ client: IDisposable, driver: IDriver }> {
@ -194,9 +210,14 @@ export function connect(headless: boolean, outPath: string, handle: string): Pro
});
const page = (await browser.pages())[0];
await page.setViewport({ width, height });
await page.goto(`http://127.0.0.1:9888?folder=${args[1]}`);
const endpointSplit = endpoint!.split('#');
await page.goto(`${endpointSplit[0]}?folder=${args[1]}#${endpointSplit[1]}`);
const result = {
client: { dispose: () => { } },
client: {
dispose: () => {
server.kill();
}
},
driver: buildDriver(browser, page)
};
c(result);