Skip to content

Commit 53efc49

Browse files
committed
Addressed review comments
1 parent 1107d0e commit 53efc49

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

docs/api.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ await context.close();
264264

265265
<!-- GEN:toc -->
266266
- [event: 'close'](#event-close)
267-
- [event: 'pageevent'](#event-pageevent)
267+
- [event: 'page'](#event-page)
268268
- [browserContext.addInitScript(script[, ...args])](#browsercontextaddinitscriptscript-args)
269269
- [browserContext.clearCookies()](#browsercontextclearcookies)
270270
- [browserContext.clearPermissions()](#browsercontextclearpermissions)
@@ -287,7 +287,7 @@ Emitted when Browser context gets closed. This might happen because of one of th
287287
- Browser application is closed or crashed.
288288
- The [`browser.close`](#browserclose) method was called.
289289

290-
#### event: 'pageevent'
290+
#### event: 'page'
291291
- <[PageEvent]>
292292

293293
Emitted when a new Page is created in the BrowserContext. The event will also fire for popup
@@ -1670,7 +1670,7 @@ This method returns all of the dedicated [WebWorkers](https://developer.mozilla.
16701670
16711671
### class: PageEvent
16721672

1673-
Event object passed to the listeners of 'pageevent' on 'BrowserContext'. Provides access
1673+
Event object passed to the listeners of ['page'](#event-page) on [`BrowserContext`](#class-browsercontext). Provides access
16741674
to the newly created page.
16751675

16761676
#### pageEvent.page()
@@ -3619,7 +3619,7 @@ const backgroundPage = await backroundPageTarget.page();
36193619
<!-- GEN:stop -->
36203620
<!-- GEN:toc-extends-BrowserContext -->
36213621
- [event: 'close'](#event-close)
3622-
- [event: 'pageevent'](#event-pageevent)
3622+
- [event: 'page'](#event-page)
36233623
- [browserContext.addInitScript(script[, ...args])](#browsercontextaddinitscriptscript-args)
36243624
- [browserContext.clearCookies()](#browsercontextclearcookies)
36253625
- [browserContext.clearPermissions()](#browsercontextclearpermissions)
@@ -3636,14 +3636,14 @@ const backgroundPage = await backroundPageTarget.page();
36363636
<!-- GEN:stop -->
36373637

36383638
#### event: 'backgroundpage'
3639-
- <[Page]>
3639+
- <[PageEvent]>
36403640

36413641
Emitted when new background page is created in the context.
36423642

36433643
> **NOTE** Only works with persistent context.
36443644
36453645
#### event: 'serviceworker'
3646-
- <[Page]>
3646+
- <[Worker]>
36473647

36483648
Emitted when new service worker is created in the context.
36493649

@@ -3884,7 +3884,7 @@ const { chromium } = require('playwright');
38843884
[Mouse]: #class-mouse "Mouse"
38853885
[Object]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object "Object"
38863886
[Page]: #class-page "Page"
3887-
[PageEvent]: #class-pageevent "PageEvent"
3887+
[PageEvent]: #class-page "PageEvent"
38883888
[Playwright]: #class-playwright "Playwright"
38893889
[Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise "Promise"
38903890
[RegExp]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp

src/chromium/crBrowser.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ export class CRBrowser extends platform.EventEmitter implements Browser {
102102
}
103103
case 'background_page': {
104104
const page = await target.page();
105-
context.emit(Events.CRBrowserContext.BackgroundPage, page);
105+
const event = new PageEvent(page!);
106+
context.emit(Events.CRBrowserContext.BackgroundPage, event);
106107
break;
107108
}
108109
case 'service_worker': {

src/events.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const Events = {
2222

2323
BrowserContext: {
2424
Close: 'close',
25-
PageEvent: 'pageevent',
25+
PageEvent: 'page',
2626
},
2727

2828
BrowserServer: {

src/platform.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ export class WebSocketTransport implements ConnectionTransport {
348348
this._ws.addEventListener('error', () => {});
349349
}
350350

351-
async send(message: string) {
352-
const error = await this._connectPromise;
351+
send(message: string) {
352+
this._connectPromise;
353353
if (error)
354354
throw error;
355355
this._ws.send(message);

test/chromium/chromium.spec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
2424
const {it, fit, xit, dit} = testRunner;
2525
const {beforeAll, beforeEach, afterAll, afterEach} = testRunner;
2626

27-
describe('BrowserContext', function() {
27+
describe('BrowserContext', function() {
2828
it('pages() should return all of the pages', async({page, server, context}) => {
2929
const second = await page.context().newPage();
3030
const allPages = await context.pages();
@@ -35,7 +35,7 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
3535
});
3636
it('should report when a new page is created and closed', async({browser, page, server, context}) => {
3737
const [otherPage] = await Promise.all([
38-
new Promise(r => context.once('pageevent', async event => r(await event.page()))),
38+
new Promise(r => context.once('page', async event => r(await event.page()))),
3939
page.evaluate(url => window.open(url), server.CROSS_PROCESS_PREFIX + '/empty.html'),
4040
]);
4141
expect(otherPage.url()).toContain(server.CROSS_PROCESS_PREFIX);
@@ -72,12 +72,12 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
7272
expect(serviceWorkerCreated).not.toBeTruthy();
7373
});
7474
it('should not report uninitialized pages', async({browser, context}) => {
75-
const pagePromise = new Promise(fulfill => context.once('pageevent', async event => fulfill(await event.page())));
75+
const pagePromise = new Promise(fulfill => context.once('page', async event => fulfill(await event.page())));
7676
context.newPage();
7777
const newPage = await pagePromise;
7878
expect(newPage.url()).toBe('about:blank');
7979

80-
const popupPromise = new Promise(fulfill => context.once('pageevent', async event => fulfill(await event.page())));
80+
const popupPromise = new Promise(fulfill => context.once('page', async event => fulfill(await event.page())));
8181
const evaluatePromise = newPage.evaluate(() => window.open('about:blank'));
8282
const popup = await popupPromise;
8383
expect(popup.url()).toBe('about:blank');
@@ -89,7 +89,7 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
8989
server.setRoute('/one-style.css', (req, res) => serverResponse = res);
9090
// Open a new page. Use window.open to connect to the page later.
9191
const [newPage] = await Promise.all([
92-
new Promise(fulfill => context.once('pageevent', async event => fulfill(await event.page()))),
92+
new Promise(fulfill => context.once('page', async event => fulfill(await event.page()))),
9393
page.evaluate(url => window.open(url), server.PREFIX + '/one-style.html'),
9494
server.waitForRequest('/one-style.css')
9595
]);
@@ -106,7 +106,7 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
106106
it('should have an opener', async({browser, page, server, context}) => {
107107
await page.goto(server.EMPTY_PAGE);
108108
const [popup] = await Promise.all([
109-
new Promise(fulfill => context.once('pageevent', async event => fulfill(await event.page()))),
109+
new Promise(fulfill => context.once('page', async event => fulfill(await event.page()))),
110110
page.goto(server.PREFIX + '/popup/window-open.html')
111111
]);
112112
await popup.waitForLoadState();
@@ -125,7 +125,7 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
125125
it('should fire page lifecycle events', async function({browser, server}) {
126126
const context = await browser.newContext();
127127
const events = [];
128-
context.on('pageevent', async event => {
128+
context.on('page', async event => {
129129
const page = await event.page();
130130
events.push('CREATED: ' + page.url());
131131
page.on('close', () => events.push('DESTROYED: ' + page.url()))

test/chromium/headful.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module.exports.describe = function({testRunner, expect, playwright, defaultBrows
5555
const backgroundPages = await context.backgroundPages();
5656
let backgroundPage = backgroundPages.length
5757
? backgroundPages[0]
58-
: await new Promise(fulfill => context.once('backgroundpage', fulfill(page)));
58+
: await new Promise(fulfill => context.once('backgroundpage', async event => fulfill(await event.page())));
5959
expect(backgroundPage).toBeTruthy();
6060
expect(await context.backgroundPages()).toContain(backgroundPage);
6161
expect(await context.pages()).not.toContain(backgroundPage);

0 commit comments

Comments
 (0)