yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: close extra browser (#1756)

Browse Source
This commit is contained in:
Dmitry Gozman 2020-04-12 15:30:53 -07:00 committed by GitHub
parent 368e1cc49b
commit 277c7d872f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/chromium/launcher.spec.js
View File

@ -72,6 +72,7 @@ describe('extensions', () => {
expect(backgroundPage).toBeTruthy(); expect(backgroundPage).toBeTruthy();
expect(context.backgroundPages()).toContain(backgroundPage); expect(context.backgroundPages()).toContain(backgroundPage);
expect(context.pages()).not.toContain(backgroundPage); expect(context.pages()).not.toContain(backgroundPage);
await context.close();
await removeUserDataDir(userDataDir); await removeUserDataDir(userDataDir);
}); });
}); });

6
test/launcher.spec.js
View File

@ -251,8 +251,12 @@ describe('browserType.launch |webSocket| option', function() {
const browserServer = await browserType.launchServer(defaultBrowserOptions); const browserServer = await browserType.launchServer(defaultBrowserOptions);
const browser = await browserType.connect({ wsEndpoint: browserServer.wsEndpoint() }); const browser = await browserType.connect({ wsEndpoint: browserServer.wsEndpoint() });
const disconnectedEventPromise = new Promise(resolve => browser.once('disconnected', resolve)); const disconnectedEventPromise = new Promise(resolve => browser.once('disconnected', resolve));
const closedPromise = new Promise(f => browserServer.on('close', f));
browserServer.kill(); browserServer.kill();
await disconnectedEventPromise; await Promise.all([
disconnectedEventPromise,
closedPromise,
]);
}); });
}); });

9
test/test.js
View File

@ -105,15 +105,12 @@ function collect(browserNames) {
const browserEnvironment = new Environment(browserName); const browserEnvironment = new Environment(browserName);
browserEnvironment.beforeAll(async state => { browserEnvironment.beforeAll(async state => {
state.browser = await state.browserType.launch(launchOptions); state.browser = await state.browserType.launch(launchOptions);
// TODO: remove browserServer from state. state._stdout = readline.createInterface({ input: state.browser._ownedServer.process().stdout });
state.browserServer = state.browser._ownedServer; state._stderr = readline.createInterface({ input: state.browser._ownedServer.process().stderr });
state._stdout = readline.createInterface({ input: state.browserServer.process().stdout });
state._stderr = readline.createInterface({ input: state.browserServer.process().stderr });
}); });
browserEnvironment.afterAll(async state => { browserEnvironment.afterAll(async state => {
await state.browserServer.close(); await state.browser.close();
delete state.browser; delete state.browser;
delete state.browserServer;
state._stdout.close(); state._stdout.close();
state._stderr.close(); state._stderr.close();
delete state._stdout; delete state._stdout;