Merge from vscode 70dc55955d586ebd427658b43cdb344f2047f9c2 (#6789)

This commit is contained in:
Anthony Dresser
2019-08-16 21:47:46 -07:00
committed by GitHub
parent fb26126bcb
commit 41d8663b09
79 changed files with 1815 additions and 572 deletions

View File

@@ -95,6 +95,7 @@ export async function launch(_args: string[]): Promise<void> {
await promisify(mkdir)(webUserDataDir);
server = spawn(join(args[0], `resources/server/web.${process.platform === 'win32' ? 'bat' : 'sh'}`), ['--browser', 'none', '--driver', 'web', '--web-user-data-dir', webUserDataDir]);
server.stderr.on('data', e => console.log('Server stderr: ' + e));
server.stdout.on('data', e => console.log('Server stdout: ' + e));
process.on('exit', teardown);
process.on('SIGINT', teardown);
endpoint = await waitForEndpoint();
@@ -129,8 +130,7 @@ export function connect(headless: boolean, outPath: string, handle: string): Pro
});
const page = (await browser.pages())[0];
await page.setViewport({ width, height });
const endpointSplit = endpoint!.split('#');
await page.goto(`${endpointSplit[0]}?folder=${args![1]}#${endpointSplit[1]}`);
await page.goto(`${endpoint}&folder=${args![1]}`);
const result = {
client: { dispose: () => teardown },
driver: buildDriver(browser, page)