Unflake navigator-view_test.ts

This is an attempt to unflake the test
"which can scroll the navigator element into view
on source file change"

Bug: none
Change-Id: I35d073ff785c3a215cfd86e29b9c0f15ad96e590
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5975524
Commit-Queue: Ergün Erdoğmuş <[email protected]>
Reviewed-by: Ergün Erdoğmuş <[email protected]>
Auto-Submit: Kim-Anh Tran <[email protected]>

Author: ktran

test/e2e/sources/navigator-view_test.ts

@@ -5,22 +5,18 @@
 import {assert} from 'chai';
 
 import {
+  click,
   getBrowserAndPages,
   waitFor,
-  waitForElementWithTextContent,
   waitForFunction,
   waitForNone,
 } from '../../shared/helper.js';
 import {openSoftContextMenuAndClickOnItem} from '../helpers/context-menu-helpers.js';
 import {
-  getMenuItemAtPosition,
-  openFileQuickOpen,
   openFileWithQuickOpen,
   runCommandWithQuickOpen,
-  typeIntoQuickOpen,
 } from '../helpers/quick_open-helpers.js';
 import {
-  createNewSnippet,
   openFileInSourcesPanel,
   openSnippetsSubPane,
   openSourceCodeEditorForFile,
@@ -154,43 +150,32 @@ describe('The Sources panel', () => {
     });
 
     it('which can scroll the navigator element into view on source file change', async () => {
-      async function openSnippet(snippet: string) {
-        await openFileQuickOpen();
-        await typeIntoQuickOpen(snippet);
-        const firstItem = await getMenuItemAtPosition(0);
-        await firstItem.click();
-      }
-
-      async function assertSnippetIsSelected(snippet: string) {
-        const selectedItem = await waitFor('.navigator-file-tree-item.selected');
-        const selectedItemName = await selectedItem.evaluate(node => node.textContent);
-        assert.strictEqual(selectedItemName, snippet);
+      async function openFirstSnippetInList() {
+        const sourcesView = await waitFor('#sources-panel-sources-view');
+        await click('[aria-label="More tabs"]', {root: sourcesView});
+        await click('[aria-label="Script snippet #1"]');
       }
 
       await openSourcesPanel();
       await openSnippetsSubPane();
 
       const numSnippets = 50;
       for (let i = 0; i < numSnippets; ++i) {
-        await createNewSnippet(`Snippet${i}`);
+        await click('[aria-label="New snippet"]');
+        await waitFor(`[aria-label="Script snippet #${i + 1}"]`);
       }
-      const firstSnippetName = 'Snippet0';
-      const lastSnippetName = `Snippet${numSnippets - 1}`;
-
-      await waitForElementWithTextContent(lastSnippetName);
-      await assertSnippetIsSelected(lastSnippetName);
 
       const snippetsPanel = await waitFor('[aria-label="Snippets panel"]');
       const scrollTopBeforeFileChange = await snippetsPanel.evaluate(panel => panel.scrollTop);
 
-      await openSnippet(firstSnippetName);
-      await assertSnippetIsSelected(firstSnippetName);
+      await openFirstSnippetInList();
+
       await waitForFunction(async () => {
-        return await snippetsPanel.evaluate(panel => panel.scrollTop) === 0;
+        const scrollTopAfterFileChange = await snippetsPanel.evaluate(panel => panel.scrollTop);
+        return scrollTopBeforeFileChange !== scrollTopAfterFileChange;
       });
 
-      const scrollTopAfterFileChange = await snippetsPanel.evaluate(panel => panel.scrollTop);
-      assert.notStrictEqual(scrollTopBeforeFileChange, scrollTopAfterFileChange);
+      assert.notStrictEqual(scrollTopBeforeFileChange, await snippetsPanel.evaluate(panel => panel.scrollTop));
     });
   });
 });