development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove timeouts in search smoketest.

Browse source 
Improvements came from waiting for search to complete before clicking buttons, clearing previous results before starting the search, and adding a retry around the clicking.
This commit is contained in:
Rob Lourens 2021-12-08 15:32:14 -08:00
parent c332de5b0c
commit 1341ca3d7f
2 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
test/automation/src/search.ts
View file

@ -33,6 +33,11 @@ export class Search extends Viewlet {
super(code);
}
async clearSearchResults(): Promise<void> {
await this.code.waitAndClick(`.sidebar .codicon-search-clear-results`);
await this.waitForNoResultText();
}
async openSearchViewlet(): Promise<any> {
if (process.platform === 'darwin') {
await this.code.dispatchKeybinding('cmd+shift+f');
@ -49,6 +54,7 @@ export class Search extends Viewlet {
}
async searchFor(text: string): Promise<void> {
await this.clearSearchResults();
await this.waitForInputFocus(INPUT);
await this.code.waitForSetValue(INPUT, text);
await this.submitSearch();
@ -74,18 +80,16 @@ export class Search extends Viewlet {
await this.code.waitAndClick(`${VIEWLET} .query-details.more .more`);
}
async removeFileMatch(filename: string): Promise<void> {
async removeFileMatch(filename: string, expectedText: string): Promise<void> {
const fileMatch = FILE_MATCH(filename);
// Retry this because the click can fail if the search tree is rerendered at the same time
await retry(
() => this.code.waitAndClick(fileMatch),
() => this.code.waitForElement(`${fileMatch} .action-label.codicon-search-remove`, el => !!el && el.top > 0 && el.left > 0, 10)
);
// ¯\_(ツ)_/¯
await new Promise(c => setTimeout(c, 500));
await this.code.waitAndClick(`${fileMatch} .action-label.codicon-search-remove`);
await this.code.waitForElement(fileMatch, el => !el);
async () => {
await this.code.waitAndClick(fileMatch);
await this.code.waitAndClick(`${fileMatch} .action-label.codicon-search-remove`);
},
async () => this.waitForResultText(expectedText, 10));
}
async expandReplace(): Promise<void> {
@ -100,22 +104,21 @@ export class Search extends Viewlet {
await this.code.waitForSetValue(`${VIEWLET} .search-widget .replace-container .monaco-inputbox textarea[title="Replace"]`, text);
}
async replaceFileMatch(filename: string): Promise<void> {
async replaceFileMatch(filename: string, expectedText: string): Promise<void> {
const fileMatch = FILE_MATCH(filename);
// Retry this because the click can fail if the search tree is rerendered at the same time
await retry(
() => this.code.waitAndClick(fileMatch),
() => this.code.waitForElement(`${fileMatch} .action-label.codicon.codicon-search-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10)
);
// ¯\_(ツ)_/¯
await new Promise(c => setTimeout(c, 500));
await this.code.waitAndClick(`${fileMatch} .action-label.codicon.codicon-search-replace-all`);
async () => {
await this.code.waitAndClick(fileMatch);
await this.code.waitAndClick(`${fileMatch} .action-label.codicon.codicon-search-replace-all`);
},
() => this.waitForResultText(expectedText, 10));
}
async waitForResultText(text: string): Promise<void> {
async waitForResultText(text: string, retryCount?: number): Promise<void> {
// The label can end with " - " depending on whether the search editor is enabled
await this.code.waitForTextContent(`${VIEWLET} .messages .message`, undefined, result => result.startsWith(text));
await this.code.waitForTextContent(`${VIEWLET} .messages .message`, undefined, result => result.startsWith(text), retryCount);
}
async waitForNoResultText(): Promise<void> {

15
test/smoke/src/areas/search/search.test.ts
View file

@ -49,25 +49,26 @@ export function setup(opts: minimist.ParsedArgs) {
await app.workbench.search.hideQueryDetails();
});
it.skip('dismisses result & checks for correct result number', async function () {
it('dismisses result & checks for correct result number', async function () {
const app = this.app as Application;
await app.workbench.search.searchFor('body');
await app.workbench.search.removeFileMatch('app.js');
await app.workbench.search.waitForResultText('12 results in 4 files');
await app.workbench.search.waitForResultText('16 results in 5 files');
await app.workbench.search.removeFileMatch('app.js', '12 results in 4 files');
});
it.skip('replaces first search result with a replace term', async function () {
it('replaces first search result with a replace term', async function () {
const app = this.app as Application;
await app.workbench.search.searchFor('body');
await app.workbench.search.waitForResultText('16 results in 5 files');
await app.workbench.search.expandReplace();
await app.workbench.search.setReplaceText('ydob');
await app.workbench.search.replaceFileMatch('app.js');
await app.workbench.search.waitForResultText('12 results in 4 files');
await app.workbench.search.replaceFileMatch('app.js', '12 results in 4 files');
await app.workbench.search.searchFor('ydob');
await app.workbench.search.waitForResultText('4 results in 1 file');
await app.workbench.search.setReplaceText('body');
await app.workbench.search.replaceFileMatch('app.js');
await app.workbench.search.replaceFileMatch('app.js', '0 results in 0 files');
await app.workbench.search.waitForResultText('0 results in 0 files');
});
});