Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(rpc): migrate DeviceDescriptors payload to an array (#2981)

Browse source 
Currently it is an object with arbitrary keys - that makes it
hard to have a protocol definition.
This commit is contained in:
Dmitry Gozman 2020-07-16 13:18:54 -07:00 committed by GitHub
parent 4c8ba3ed67
commit 439e048a4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rpc/channels.ts
View file

@ -29,7 +29,7 @@ export type PlaywrightInitializer = {
firefox: BrowserTypeChannel, firefox: BrowserTypeChannel,
webkit: BrowserTypeChannel, webkit: BrowserTypeChannel,
electron?: ElectronChannel, electron?: ElectronChannel,
deviceDescriptors: types.Devices, deviceDescriptors: { name: string, descriptor: types.DeviceDescriptor }[],
selectors: SelectorsChannel, selectors: SelectorsChannel,
}; };

4
src/rpc/client/playwright.ts
View file

@ -35,7 +35,9 @@ export class Playwright extends ChannelOwner<PlaywrightChannel, PlaywrightInitia
this.webkit = BrowserType.from(initializer.webkit); this.webkit = BrowserType.from(initializer.webkit);
if (initializer.electron) if (initializer.electron)
(this as any).electron = Electron.from(initializer.electron); (this as any).electron = Electron.from(initializer.electron);
this.devices = initializer.deviceDescriptors; this.devices = {};
for (const { name, descriptor } of initializer.deviceDescriptors)
this.devices[name] = descriptor;
this.selectors = Selectors.from(initializer.selectors); this.selectors = Selectors.from(initializer.selectors);
} }
} }

4
src/rpc/server/playwrightDispatcher.ts
View file

@ -25,12 +25,14 @@ import { ElectronDispatcher } from './electronDispatcher';
export class PlaywrightDispatcher extends Dispatcher<Playwright, PlaywrightInitializer> implements PlaywrightChannel { export class PlaywrightDispatcher extends Dispatcher<Playwright, PlaywrightInitializer> implements PlaywrightChannel {
constructor(scope: DispatcherScope, playwright: Playwright) { constructor(scope: DispatcherScope, playwright: Playwright) {
const electron = (playwright as any).electron as (Electron | undefined); const electron = (playwright as any).electron as (Electron | undefined);
const deviceDescriptors = Object.entries(playwright.devices)
.map(([name, descriptor]) => ({ name, descriptor }));
super(scope, playwright, 'playwright', { super(scope, playwright, 'playwright', {
chromium: new BrowserTypeDispatcher(scope, playwright.chromium!), chromium: new BrowserTypeDispatcher(scope, playwright.chromium!),
firefox: new BrowserTypeDispatcher(scope, playwright.firefox!), firefox: new BrowserTypeDispatcher(scope, playwright.firefox!),
webkit: new BrowserTypeDispatcher(scope, playwright.webkit!), webkit: new BrowserTypeDispatcher(scope, playwright.webkit!),
electron: electron ? new ElectronDispatcher(scope, electron) : undefined, electron: electron ? new ElectronDispatcher(scope, electron) : undefined,
deviceDescriptors: playwright.devices, deviceDescriptors,
selectors: new SelectorsDispatcher(scope, playwright.selectors), selectors: new SelectorsDispatcher(scope, playwright.selectors),
}, false, 'playwright'); }, false, 'playwright');
} }