Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-20 02:34:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

smoketest: more search assertions

Browse Source
This commit is contained in:
Joao Moreno
2018-06-06 11:23:39 +02:00
parent 515b4254f3
commit 78d7d64c5d
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/smoke/src/areas/search/search.ts
+26 -4
View File
@@ -11,6 +11,22 @@ const INPUT = `${VIEWLET} .search-widget .search-container .monaco-inputbox inpu
const INCLUDE_INPUT = `${VIEWLET} .query-details .file-types.includes .monaco-inputbox input`;
const FILE_MATCH = filename => `${VIEWLET} .results .filematch[data-resource$="${filename}"]`;
async function retry(setup: () => Promise<any>, attempt: () => Promise<any>) {
let count = 0;
while (true) {
await setup();
try {
await attempt();
return;
} catch (err) {
if (++count > 5) {
throw err;
}
}
}
}
export class Search extends Viewlet {
constructor(code: Code) {
@@ -56,8 +72,11 @@ export class Search extends Viewlet {
async removeFileMatch(filename: string): Promise<void> {
const fileMatch = FILE_MATCH(filename);
await this.code.waitAndClick(fileMatch);
await this.code.waitForElement(`${fileMatch} .action-label.icon.action-remove`, el => !!el && el.top > 0 && el.left > 0);
await retry(
() => this.code.waitAndClick(fileMatch),
() => this.code.waitForElement(`${fileMatch} .action-label.icon.action-remove`, el => !!el && el.top > 0 && el.left > 0, 10)
);
await this.code.waitAndClick(`${fileMatch} .action-label.icon.action-remove`);
await this.code.waitForElement(fileMatch, el => !el);
}
@@ -77,8 +96,11 @@ export class Search extends Viewlet {
async replaceFileMatch(filename: string): Promise<void> {
const fileMatch = FILE_MATCH(filename);
await this.code.waitAndClick(fileMatch);
await this.code.waitForElement(`${fileMatch} .action-label.icon.action-replace-all`, el => !!el && el.top > 0 && el.left > 0);
await retry(
() => this.code.waitAndClick(fileMatch),
() => this.code.waitForElement(`${fileMatch} .action-label.icon.action-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10)
);
await this.code.waitAndClick(`${fileMatch} .action-label.icon.action-replace-all`);
}