Skip to content

Commit a1064d4

Browse files
jackfranklinCommit Bot
authored andcommitted
Sort expected files in search results e2e test
To fix e2e flakes where the ordering may differ, such as: https://logs.chromium.org/logs/devtools-frontend/buildbucket/cr-buildbucket.appspot.com/8879147594763513568/+/steps/E2E_tests/0/stdout Change-Id: I66ae32b5ec6adea897d104d354a31e044ce9fc8e Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2218009 Auto-Submit: Jack Franklin <[email protected]> Reviewed-by: Tim van der Lippe <[email protected]> Reviewed-by: Benedikt Meurer <[email protected]> Commit-Queue: Tim van der Lippe <[email protected]>
1 parent d81fad6 commit a1064d4

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

test/e2e/search/search-scope_test.ts

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,31 @@ describe('The Search Panel', async () => {
4040

4141
// Process the results into something manageable.
4242
const fileResults = await $$(SEARCH_FILE_RESULT, resultsContainer);
43-
const files = await fileResults.evaluate(result => result.map((value: Element) => {
43+
44+
interface FileSearchResult {
45+
matchesCount: number;
46+
fileName: string;
47+
}
48+
49+
const files: FileSearchResult[] = await fileResults.evaluate(result => result.map((value: Element) => {
4450
const SEARCH_RESULT_FILE_NAME = '.search-result-file-name';
4551
const SEARCH_RESULT_MATCHES_COUNT = '.search-result-matches-count';
4652

4753
// Wrap the entries with the file details.
4854
return {
4955
fileName: value.querySelector(SEARCH_RESULT_FILE_NAME)!.firstChild!.textContent,
50-
matchesCount: value.querySelector(SEARCH_RESULT_MATCHES_COUNT)!.textContent,
56+
matchesCount: parseInt(value.querySelector(SEARCH_RESULT_MATCHES_COUNT)!.textContent!, 10),
5157
};
5258
}));
5359

60+
files.sort((a, b) => {
61+
return a.matchesCount - b.matchesCount;
62+
});
63+
5464
assert.deepEqual(files, [
55-
{fileName: 'search.css', matchesCount: '3'},
56-
{fileName: 'search.js', matchesCount: '5'},
57-
{fileName: 'search.html', matchesCount: '4'},
65+
{fileName: 'search.css', matchesCount: 3},
66+
{fileName: 'search.html', matchesCount: 4},
67+
{fileName: 'search.js', matchesCount: 5},
5868
]);
5969

6070
// Now step through the actual entries of the search result.

0 commit comments

Comments
 (0)