[test] Use frontend directly

The helpers are DevTools specific

Bug: none
Change-Id: If12bbc6a0c3de520b8963ebd58f0253711e17e1d
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6262910
Reviewed-by: Alina Varkki <[email protected]>
Auto-Submit: Nikolay Vitkov <[email protected]>
Commit-Queue: Alina Varkki <[email protected]>

Author: Lightning00Blade

extensions/cxx_debugging/e2e/TestDriver.ts

@@ -136,7 +136,7 @@ describe('CXX Debugging Extension Test Suite', function() {
             await focusConsolePrompt();
 
             for (const {expression, value} of evaluations) {
-              await typeIntoConsoleAndWaitForResult(frontend, expression);
+              await typeIntoConsoleAndWaitForResult(expression);
               const evaluateResults = await frontend.evaluate(() => {
                 return Array.from(document.querySelectorAll('.console-user-command-result'))
                     .map(node => node.textContent);

test/e2e/application/cookies_test.ts

@@ -37,9 +37,8 @@ describe('The Application Tab', () => {
   it.skip(
       '[crbug.com/1443434]: shows cookies even when navigating to an unreachable page (crbug.com/1047348)',
       async () => {
-        const {target} = getBrowserAndPages();
         // This sets a new cookie foo=bar
-        await navigateToApplicationTab(target, 'cookies');
+        await navigateToApplicationTab('cookies');
 
         await goToResource('network/unreachable.rawresponse');
 
@@ -50,9 +49,8 @@ describe('The Application Tab', () => {
       });
 
   it('shows a preview of the cookie value (crbug.com/462370)', async () => {
-    const {target} = getBrowserAndPages();
     // This sets a new cookie foo=bar
-    await navigateToApplicationTab(target, 'cookies');
+    await navigateToApplicationTab('cookies');
 
     await navigateToCookiesForTopDomain();
 
@@ -69,9 +67,8 @@ describe('The Application Tab', () => {
   // reflect the change from the partitionKey column to the partition key site and
   // cross-site columns.
   it.skip('[crbug.com/345285378]shows cookie partition key site and has cross site ancestor', async () => {
-    const {target} = getBrowserAndPages();
     // This sets a new cookie foo=bar
-    await navigateToApplicationTab(target, 'cookies');
+    await navigateToApplicationTab('cookies');
 
     await navigateToCookiesForTopDomain();
 
@@ -109,9 +106,8 @@ describe('The Application Tab', () => {
   });
 
   it('can also show the urldecoded value (crbug.com/997625)', async () => {
-    const {target} = getBrowserAndPages();
     // This sets a new cookie foo=bar
-    await navigateToApplicationTab(target, 'cookies');
+    await navigateToApplicationTab('cookies');
 
     await navigateToCookiesForTopDomain();
 
@@ -135,9 +131,8 @@ describe('The Application Tab', () => {
   });
 
   it('clears the preview value when clearing cookies (crbug.com/1086462)', async () => {
-    const {target} = getBrowserAndPages();
     // This sets a new cookie foo=bar
-    await navigateToApplicationTab(target, 'cookies');
+    await navigateToApplicationTab('cookies');
 
     await navigateToCookiesForTopDomain();
 
@@ -163,9 +158,8 @@ describe('The Application Tab', () => {
 
   it('only clear currently visible cookies (crbug.com/978059)', async () => {
     expectError('Request CacheStorage.requestCacheNames failed. {"code":-32602,"message":"Invalid security origin"}');
-    const {target} = getBrowserAndPages();
     // This sets a new cookie foo=bar
-    await navigateToApplicationTab(target, 'cookies');
+    await navigateToApplicationTab('cookies');
 
     await navigateToCookiesForTopDomain();
 

test/e2e/application/frame-tree_test.ts

@@ -73,8 +73,7 @@ const getFieldValuesTextContent = async () => {
 describe('The Application Tab', () => {
   // Update and reactivate when the whole FrameDetailsView is a custom component
   it.skip('[crbug.com/1519420]: shows details for a frame when clicked on in the frame tree', async () => {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'frame-tree');
+    await navigateToApplicationTab('frame-tree');
     await click('#tab-resources');
     await navigateToFrame('top');
 
@@ -98,8 +97,7 @@ describe('The Application Tab', () => {
 
   it('shows stack traces for OOPIF', async () => {
     expectError('Request CacheStorage.requestCacheNames failed. {"code":-32602,"message":"Invalid security origin"}');
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'js-oopif');
+    await navigateToApplicationTab('js-oopif');
     await waitForFunction(async () => {
       await navigateToFrame('top');
       await navigateToFrame('iframe.html');
@@ -126,8 +124,7 @@ describe('The Application Tab', () => {
   it('stack traces for OOPIF with ignore listed frames can be expanded and collapsed', async () => {
     expectError('Request CacheStorage.requestCacheNames failed. {"code":-32602,"message":"Invalid security origin"}');
     await setIgnoreListPattern('js-oopif.js');
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'js-oopif');
+    await navigateToApplicationTab('js-oopif');
     await waitForFunction(async () => {
       await navigateToFrame('top');
       await navigateToFrame('iframe.html');
@@ -190,7 +187,7 @@ describe('The Application Tab', () => {
 
     it('shows details for opened windows in the frame tree', async () => {
       const {target, frontend} = getBrowserAndPages();
-      await navigateToApplicationTab(target, 'frame-tree');
+      await navigateToApplicationTab('frame-tree');
       await click('#tab-resources');
       await navigateToFrame('top');
 
@@ -226,7 +223,7 @@ describe('The Application Tab', () => {
   it('shows dedicated workers in the frame tree', async () => {
     expectError('Request CacheStorage.requestCacheNames failed. {"code":-32602,"message":"Invalid security origin"}');
     const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'frame-tree');
+    await navigateToApplicationTab('frame-tree');
     await navigateToFrame('top');
     // DevTools is not ready yet when the worker is being initially attached.
     // We therefore need to reload the page to see the worker in DevTools.
@@ -252,8 +249,7 @@ describe('The Application Tab', () => {
 
   it('shows service workers in the frame tree', async () => {
     expectError('Request CacheStorage.requestCacheNames failed. {"code":-32602,"message":"Invalid security origin"}');
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'service-worker-network');
+    await navigateToApplicationTab('service-worker-network');
     await navigateToFrameServiceWorkers('top');
     void pressKey('ArrowDown');
 

test/e2e/application/manifest_test.ts

@@ -4,7 +4,7 @@
 
 import {assert} from 'chai';
 
-import {click, getBrowserAndPages, getTestServerPort, waitFor} from '../../shared/helper.js';
+import {click, getTestServerPort, waitFor} from '../../shared/helper.js';
 import {getTrimmedTextContent, navigateToApplicationTab} from '../helpers/application-helpers.js';
 
 const MANIFEST_SELECTOR = '[aria-label="Manifest"]';
@@ -21,8 +21,7 @@ const FIELD_VALUES_SELECTOR = '.report-field-value';
 // npm run debug-e2etest -- -- --chrome-features=WebAppEnableManifestId
 describe.skip('[crbug.com/1222571]: The Manifest Page', () => {
   it('shows app id', async () => {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'app-manifest-id');
+    await navigateToApplicationTab('app-manifest-id');
     await click(MANIFEST_SELECTOR);
     await waitFor(APP_ID_SELECTOR);
 
@@ -33,8 +32,7 @@ describe.skip('[crbug.com/1222571]: The Manifest Page', () => {
   });
 
   it('shows start id as app id', async () => {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'app-manifest-no-id');
+    await navigateToApplicationTab('app-manifest-no-id');
     await click(MANIFEST_SELECTOR);
     await waitFor(APP_ID_SELECTOR);
 

test/e2e/application/reporting-api_test.ts

@@ -6,7 +6,6 @@ import {assert} from 'chai';
 
 import {
   click,
-  getBrowserAndPages,
   getTestServerPort,
   goToResource,
   waitFor,
@@ -18,14 +17,12 @@ const REPORTING_API_SELECTOR = '[aria-label="Reporting API"]';
 
 describe('The Reporting API Page', () => {
   beforeEach(async () => {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'empty');
+    await navigateToApplicationTab('empty');
   });
 
   // Flaky on mac
   it.skipOnPlatforms(['mac'], '[crbug.com/1482688] shows reports', async () => {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, 'reporting-api');
+    await navigateToApplicationTab('reporting-api');
     await click(REPORTING_API_SELECTOR);
     const dataGrid = await getDataGrid();
     const innerText = await getInnerTextOfDataGridCells(dataGrid, 1, false);

test/e2e/application/service-worker-network_test.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 import {unregisterAllServiceWorkers} from '../../conductor/hooks.js';
-import {click, getBrowserAndPages, step} from '../../shared/helper.js';
+import {click, step} from '../../shared/helper.js';
 import {
   navigateToApplicationTab,
   navigateToServiceWorkers,
@@ -17,8 +17,7 @@ const SERVICE_WORKER_NETWORK_SELECTOR = '[title="Network requests"]';
 
 describe('The Application Tab', () => {
   beforeEach(async () => {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, TEST_HTML_FILE);
+    await navigateToApplicationTab(TEST_HTML_FILE);
     await navigateToServiceWorkers();
   });
 

test/e2e/application/service-worker-update_test.ts

@@ -4,7 +4,7 @@
 import {assert} from 'chai';
 
 import {unregisterAllServiceWorkers} from '../../conductor/hooks.js';
-import {getBrowserAndPages, step, waitFor} from '../../shared/helper.js';
+import {step, waitFor} from '../../shared/helper.js';
 import {
   navigateToApplicationTab,
   navigateToServiceWorkers,
@@ -16,8 +16,7 @@ const SERVICE_WORKER_UPDATE_TIMELINE_SELECTOR = '.service-worker-update-timing-t
 
 describe('The Application Tab', function() {
   beforeEach(async function() {
-    const {target} = getBrowserAndPages();
-    await navigateToApplicationTab(target, TEST_HTML_FILE);
+    await navigateToApplicationTab(TEST_HTML_FILE);
     await navigateToServiceWorkers();
   });
 

test/e2e/application/session-storage_test.ts

@@ -4,7 +4,7 @@
 
 import {assert} from 'chai';
 
-import {getBrowserAndPages, step} from '../../shared/helper.js';
+import {step} from '../../shared/helper.js';
 import {
   deleteSelectedStorageItem,
   getStorageItemsData,
@@ -15,10 +15,8 @@ import {
 
 describe('The Application Tab', () => {
   it('shows Session Storage keys and values', async () => {
-    const {target} = getBrowserAndPages();
-
     await step('navigate to session-storage resource and open Application tab', async () => {
-      await navigateToApplicationTab(target, 'session-storage');
+      await navigateToApplicationTab('session-storage');
     });
 
     await step('open the domain storage', async () => {
@@ -41,9 +39,7 @@ describe('The Application Tab', () => {
   });
 
   it('can delete selected items', async () => {
-    const {target} = getBrowserAndPages();
-
-    await navigateToApplicationTab(target, 'session-storage');
+    await navigateToApplicationTab('session-storage');
 
     await navigateToSessionStorageForTopDomain();
 

test/e2e/application/shared-storage_test.ts

@@ -8,7 +8,6 @@ import {expectError} from '../../conductor/events.js';
 import {
   $$,
   clickElement,
-  getBrowserAndPages,
   getTestServerPort,
   goToResource,
   step,
@@ -41,11 +40,9 @@ describe('The Application Tab', () => {
 
   // Failing test.
   it.skip('[crbug.com/1485830]: shows Shared Storage events', async () => {
-    const {target} = getBrowserAndPages();
-
     await step('navigate to shared-storage resource and open Application tab', async () => {
       // Events are not recorded because tracking is not yet enabled.
-      await navigateToApplicationTab(target, 'shared-storage');
+      await navigateToApplicationTab('shared-storage');
     });
 
     await step('open the events view', async () => {
@@ -85,10 +82,8 @@ describe('The Application Tab', () => {
 
   // Failing test.
   it.skip('[crbug.com/1485830]: shows Shared Storage metadata', async () => {
-    const {target} = getBrowserAndPages();
-
     await step('navigate to shared-storage resource and open Application tab', async () => {
-      await navigateToApplicationTab(target, 'shared-storage');
+      await navigateToApplicationTab('shared-storage');
     });
 
     await step('open the domain storage', async () => {
@@ -104,10 +99,8 @@ describe('The Application Tab', () => {
 
   // Failing test.
   it.skip('[crbug.com/1485830]: shows Shared Storage keys and values', async () => {
-    const {target} = getBrowserAndPages();
-
     await step('navigate to shared-storage resource and open Application tab', async () => {
-      await navigateToApplicationTab(target, 'shared-storage');
+      await navigateToApplicationTab('shared-storage');
     });
 
     await step('open the domain storage', async () => {

test/e2e/application/storage_test.ts

@@ -21,8 +21,7 @@ describe('The Application Tab', () => {
     // The tests in this suite are particularly slow, as they perform a lot of actions
     this.timeout(20000);
     beforeEach(async () => {
-      const {target} = getBrowserAndPages();
-      await navigateToApplicationTab(target, 'storage-quota');
+      await navigateToApplicationTab('storage-quota');
       await navigateToStorage();
     });