Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

more api cleanup

Browse Source
This commit is contained in:
Joao Moreno
2018-04-05 22:55:26 +02:00
parent 9da0f472dd
commit d25c6c4121
1 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/smoke/src/spectron/client.ts
View File

@@ -14,6 +14,13 @@ export interface APIElement {
export interface Driver {
keys(keys: string[]): Promise<void>;
click(selector: string, xoffset?: number, yoffset?: number): Promise<any>;
doubleClick(selector: string): Promise<any>;
move(selector: string): Promise<any>;
setValue(selector: string, text: string): Promise<void>;
getTitle(): Promise<string>;
isActiveElement(selector: string): Promise<boolean>;
getElements(selector: string): Promise<APIElement[]>;
}
@@ -26,6 +33,31 @@ export class SpectronDriver implements Driver {
return Promise.resolve();
}
async click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): Promise<void> {
await this.spectronClient.leftClick(selector, xoffset, yoffset);
}
async doubleClick(selector: string): Promise<void> {
await this.spectronClient.doubleClick(selector);
}
async move(selector: string): Promise<void> {
await this.spectronClient.moveToObject(selector);
}
async setValue(selector: string, text: string): Promise<void> {
await this.spectronClient.setValue(selector, text);
}
async getTitle(): Promise<string> {
return await this.spectronClient.getTitle();
}
async isActiveElement(selector: string): Promise<boolean> {
const result = await (this.spectronClient.execute(s => document.activeElement.matches(s), selector) as any as Promise<{ value: boolean; }>);
return result.value;
}
async getElements(selector: string): Promise<APIElement[]> {
const result = await (this.spectronClient.execute(selector => {
const query = document.querySelectorAll(selector);
@@ -75,28 +107,29 @@ export class API {
}
async waitAndClick(selector: string, xoffset?: number, yoffset?: number): Promise<any> {
return this.waitFor(() => this.spectronClient.leftClick(selector, xoffset, yoffset), void 0, `click with selector ${selector}`);
return this.waitFor(() => this.driver.click(selector, xoffset, yoffset), () => true, `click with selector ${selector}`);
}
async waitAndDoubleClick(selector: string, capture: boolean = true): Promise<any> {
return this.waitFor(() => this.spectronClient.doubleClick(selector), void 0, `doubleClick with selector ${selector}`);
return this.waitFor(() => this.driver.doubleClick(selector), () => true, `doubleClick with selector ${selector}`);
}
async waitAndMove(selector: string): Promise<any> {
return this.waitFor(() => this.spectronClient.moveToObject(selector), void 0, `move to object with selector ${selector}`);
return this.waitFor(() => this.driver.move(selector), () => true, `move to object with selector ${selector}`);
}
async setValue(selector: string, text: string, capture: boolean = true): Promise<any> {
return this.spectronClient.setValue(selector, text);
return this.driver.setValue(selector, text);
}
async doesElementExist(selector: string): Promise<boolean> {
return this.spectronClient.element(selector).then(result => !!result.value);
const elements = await this.driver.getElements(selector);
return elements.length > 0;
}
async getElementCount(selector: string): Promise<number> {
const result = await this.spectronClient.elements(selector);
return result.value.length;
const elements = await this.driver.getElements(selector);
return elements.length;
}
async waitForElements(selector: string, accept: (result: APIElement[]) => boolean = result => result.length > 0): Promise<APIElement[]> {
@@ -108,15 +141,11 @@ export class API {
}
async waitForActiveElement(selector: string): Promise<any> {
return this.waitFor(
() => this.spectronClient.execute(s => document.activeElement.matches(s), selector),
r => r.value,
`wait for active element: ${selector}`
);
return this.waitFor(() => this.driver.isActiveElement(selector), undefined, `wait for active element: ${selector}`);
}
async getTitle(): Promise<string> {
return this.spectronClient.getTitle();
return this.driver.getTitle();
}
selectorExecute<P>(