fix electron

Author: JoelEinbinder

src/client/electron.ts

@@ -67,14 +67,18 @@ export class ElectronApplication extends ChannelOwner<channels.ElectronApplicati
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.ElectronApplicationInitializer) {
     super(parent, type, guid, initializer);
     this._context = BrowserContext.from(initializer.context);
-    this._context.on(Events.BrowserContext.Page, page => {
-      this._windows.add(page);
-      this.emit(Events.ElectronApplication.Window, page);
-      page.once(Events.Page.Close, () => this._windows.delete(page));
-    });
+    for (const page of this._context._pages)
+      this._onPage(page);
+    this._context.on(Events.BrowserContext.Page, page => this._onPage(page));
     this._channel.on('close', () => this.emit(Events.ElectronApplication.Close));
   }
 
+  _onPage(page: Page) {
+    this._windows.add(page);
+    this.emit(Events.ElectronApplication.Window, page);
+    page.once(Events.Page.Close, () => this._windows.delete(page));
+  }
+
   windows(): Page[] {
     // TODO: add ElectronPage class inherting from Page.
     return [...this._windows];

src/server/electron/electron.ts

@@ -63,6 +63,8 @@ export class ElectronApplication extends SdkObject {
       // Emit application closed after context closed.
       Promise.resolve().then(() => this.emit(ElectronApplication.Events.Close));
     });
+    for (const page of this._browserContext.pages())
+      this._onPage(page);
     this._browserContext.on(BrowserContext.Events.Page, event => this._onPage(event));
     this._nodeConnection = nodeConnection;
     this._nodeSession = nodeConnection.rootSession;
@@ -77,7 +79,7 @@ export class ElectronApplication extends SdkObject {
     this._nodeSession.send('Runtime.enable', {}).catch(e => {});
   }
 
-  private async _onPage(page: Page) {
+  private _onPage(page: Page) {
     // Needs to be sync.
     const windowId = ++this._lastWindowId;
     (page as any)._browserWindowId = windowId;

tests/electron/electron-app.spec.ts

@@ -102,7 +102,7 @@ test('should return browser window', async ({ playwright }) => {
   const electronApp = await playwright._electron.launch({
     args: [path.join(__dirname, 'electron-window-app.js')],
   });
-  const page = await electronApp.waitForEvent('window');
+  const page = await electronApp.firstWindow();
   const bwHandle = await electronApp.browserWindow(page);
   expect(await bwHandle.evaluate((bw: BrowserWindow) => bw.title)).toBe('Electron');
   await electronApp.close();