development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use handles in playwright driver

Browse source
This commit is contained in:
Daniel Imms 2021-11-10 08:03:22 -08:00
parent bd98431baf
commit 6a6a1b65df
3 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.json
View file

@ -951,6 +951,8 @@
"**/test/automation/**", "**/test/automation/**",
"@vscode/*", "@vscode/*",
"@parcel/*", "@parcel/*",
"playwright-core/**",
"**/vs/platform/driver/common/**",
"*" // node modules "*" // node modules
] ]
}, },

2
src/vs/platform/driver/browser/baseDriver.ts
View file

@ -8,7 +8,7 @@ import { coalesce } from 'vs/base/common/arrays';
import { language, locale } from 'vs/base/common/platform'; import { language, locale } from 'vs/base/common/platform';
import { IElement, ILocaleInfo, ILocalizedStrings, IWindowDriver } from 'vs/platform/driver/common/driver'; import { IElement, ILocaleInfo, ILocalizedStrings, IWindowDriver } from 'vs/platform/driver/common/driver';
import localizedStrings from 'vs/platform/localizations/common/localizedStrings'; import localizedStrings from 'vs/platform/localizations/common/localizedStrings';
import type { Terminal } from 'xterm'; import type { Terminal } from 'xterm'; // eslint-disable-line code-import-patterns
function serializeElement(element: Element, recursive: boolean): IElement { function serializeElement(element: Element, recursive: boolean): IElement {
const attributes = Object.create(null); const attributes = Object.create(null);

45
test/automation/src/playwrightDriver.ts
View file

@ -11,7 +11,8 @@ import { promisify } from 'util';
import { IDriver, IDisposable } from './driver'; import { IDriver, IDisposable } from './driver';
import { URI } from 'vscode-uri'; import { URI } from 'vscode-uri';
import * as kill from 'tree-kill'; import * as kill from 'tree-kill';
import { IElement, ILocaleInfo, ILocalizedStrings } from '.'; import { PageFunction } from 'playwright-core/types/structs';
import { IWindowDriver } from '../../../src/vs/platform/driver/common/driver';
const width = 1200; const width = 1200;
const height = 800; const height = 800;
@ -96,35 +97,45 @@ class PlaywrightDriver implements IDriver {
await this.click(windowId, selector, 0, 0); await this.click(windowId, selector, 0, 0);
await timeout(100); await timeout(100);
} }
async setValue(windowId: number, selector: string, text: string) { async setValue(windowId: number, selector: string, text: string) {
await this._page.evaluate(`window.driver.setValue('${selector}', '${text}')`); return this._page.evaluate(([driver, selector, text]) => driver.setValue(selector, text), [await this._getDriverHandle(), selector, text] as const);
} }
async getTitle(windowId: number) { async getTitle(windowId: number) {
return this._page.evaluate<string>(`window.driver.getTitle()`); return this._evaluateWithDriver(([driver]) => driver.getTitle());
} }
isActiveElement(windowId: number, selector: string) { async isActiveElement(windowId: number, selector: string) {
return this._page.evaluate<boolean>(`window.driver.isActiveElement('${selector}')`); return this._page.evaluate(([driver, selector]) => driver.isActiveElement(selector), [await this._getDriverHandle(), selector] as const);
} }
getElements(windowId: number, selector: string, recursive?: boolean) { async getElements(windowId: number, selector: string, recursive: boolean = false) {
return this._page.evaluate<IElement[]>(`window.driver.getElements('${selector}', ${recursive})`); return this._page.evaluate(([driver, selector, recursive]) => driver.getElements(selector, recursive), [await this._getDriverHandle(), selector, recursive] as const);
} }
getElementXY(windowId: number, selector: string, xoffset?: number, yoffset?: number) { async getElementXY(windowId: number, selector: string, xoffset?: number, yoffset?: number) {
return this._page.evaluate<{ x: number, y: number }>(`window.driver.getElementXY('${selector}', ${xoffset}, ${yoffset})`); return this._page.evaluate(([driver, selector, xoffset, yoffset]) => driver.getElementXY(selector, xoffset, yoffset), [await this._getDriverHandle(), selector, xoffset, yoffset] as const);
} }
async typeInEditor(windowId: number, selector: string, text: string) { async typeInEditor(windowId: number, selector: string, text: string) {
await this._page.evaluate(`window.driver.typeInEditor('${selector}', '${text}')`); return this._page.evaluate(([driver, selector, text]) => driver.typeInEditor(selector, text), [await this._getDriverHandle(), selector, text] as const);
} }
getTerminalBuffer(windowId: number, selector: string) { async getTerminalBuffer(windowId: number, selector: string) {
return this._page.evaluate<string[]>(`window.driver.getTerminalBuffer('${selector}')`); return this._page.evaluate(([driver, selector]) => driver.getTerminalBuffer(selector), [await this._getDriverHandle(), selector] as const);
} }
async writeInTerminal(windowId: number, selector: string, text: string) { async writeInTerminal(windowId: number, selector: string, text: string) {
await this._page.evaluate(`window.driver.writeInTerminal('${selector}', '${text}')`); return this._page.evaluate(([driver, selector, text]) => driver.writeInTerminal(selector, text), [await this._getDriverHandle(), selector, text] as const);
} }
getLocaleInfo(windowId: number) { async getLocaleInfo(windowId: number) {
return this._page.evaluate<ILocaleInfo>(`window.driver.getLocaleInfo()`); return this._evaluateWithDriver(([driver]) => driver.getLocaleInfo());
} }
getLocalizedStrings(windowId: number) { async getLocalizedStrings(windowId: number) {
return this._page.evaluate<ILocalizedStrings>(`window.driver.getLocalizedStrings()`); return this._evaluateWithDriver(([driver]) => driver.getLocalizedStrings());
}
private async _evaluateWithDriver<T>(pageFunction: PageFunction<playwright.JSHandle<IWindowDriver>[], T>) {
return this._page.evaluate(pageFunction, [await this._getDriverHandle()]);
}
// TODO: Cache
private async _getDriverHandle(): Promise<playwright.JSHandle<IWindowDriver>> {
return this._page.evaluateHandle('window.driver');
} }
} }