Migrate console-log_test.ts

Fixed: 416405356
Change-Id: I89322aa8b1418748175dfedc8866d734c405a22b
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6703873
Commit-Queue: Alex Rudenko <[email protected]>
Reviewed-by: Simon Zünd <[email protected]>

Author: OrKoN

test/e2e/console/BUILD.gn

@@ -18,7 +18,6 @@ node_ts_library("console") {
     "console-ignore-list_test.ts",
     "console-insight_test.ts",
     "console-last-result_test.ts",
-    "console-log_test.ts",
     "console-message-format_test.ts",
     "console-repl-mode_test.ts",
     "console-stack-trace_test.ts",

test/e2e/helpers/console-helpers.ts

@@ -8,7 +8,6 @@ import {AsyncScope} from '../../conductor/async-scope.js';
 import type {DevToolsPage} from '../../e2e_non_hosted/shared/frontend-helper.js';
 import {
   click,
-  goToResource,
   waitFor,
   waitForFunction
 } from '../../shared/helper.js';
@@ -129,14 +128,17 @@ export async function waitForLastConsoleMessageToHaveContent(
   await expectVeEvents([veImpressionForConsoleMessage()], await veRoot(devToolsPage), devToolsPage);
 }
 
-export async function getConsoleMessages(testName: string, withAnchor = false, callback?: () => Promise<void>) {
+export async function getConsoleMessages(
+    testName: string, withAnchor = false, callback?: () => Promise<void>,
+    devToolsPage = getBrowserAndPagesWrappers().devToolsPage,
+    inspectedPage = getBrowserAndPagesWrappers().inspectedPage) {
   // Ensure Console is loaded before the page is loaded to avoid a race condition.
-  await navigateToConsoleTab();
+  await navigateToConsoleTab(devToolsPage);
 
   // Have the target load the page.
-  await goToResource(`console/${testName}.html`);
+  await inspectedPage.goToResource(`console/${testName}.html`);
 
-  return await getCurrentConsoleMessages(withAnchor, Level.All, callback);
+  return await getCurrentConsoleMessages(withAnchor, Level.All, callback, devToolsPage);
 }
 
 export async function getCurrentConsoleMessages(
@@ -353,10 +355,12 @@ export async function selectConsoleSidebarItem(itemPosition = SidebarItem.Info)
   await click(itemSelector, {root: sidebar});
 }
 
-export async function waitForConsoleInfoMessageAndClickOnLink() {
-  const consoleMessage = await waitFor('div.console-group-messages .console-info-level span.source-code');
-  await click('button.devtools-link', {root: consoleMessage});
-  await expectVeEvents([veClick('Item: console-message > Link: script-location')], await veRoot());
+export async function waitForConsoleInfoMessageAndClickOnLink(
+    devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
+  const consoleMessage = await devToolsPage.waitFor('div.console-group-messages .console-info-level span.source-code');
+  await devToolsPage.click('button.devtools-link', {root: consoleMessage});
+  await expectVeEvents(
+      [veClick('Item: console-message > Link: script-location')], await veRoot(devToolsPage), devToolsPage);
 }
 
 export async function turnOffHistoryAutocomplete() {

test/e2e/helpers/sources-helpers.ts

@@ -14,7 +14,6 @@ import {
   $$,
   assertNotNullOrUndefined,
   click,
-  clickElement,
   clickMoreTabsButton,
   drainFrontendTaskQueue,
   getBrowserAndPages,
@@ -262,24 +261,24 @@ export async function removeBreakpointForLine(
   await devToolsPage.waitForFunction(async () => !(await isBreakpointSet(index, devToolsPage)));
 }
 
-export async function addLogpointForLine(index: number, condition: string) {
-  const {frontend} = getBrowserAndPages();
-  const breakpointLine = await getLineNumberElement(index);
+export async function addLogpointForLine(
+    index: number, condition: string, devToolsPage: DevToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
+  const breakpointLine = await getLineNumberElement(index, devToolsPage);
   assertNotNullOrUndefined(breakpointLine);
 
-  await waitForFunction(async () => !(await isBreakpointSet(index)));
-  await clickElement(breakpointLine, {clickOptions: {button: 'right'}});
+  await devToolsPage.waitForFunction(async () => !(await isBreakpointSet(index, devToolsPage)));
+  await devToolsPage.clickElement(breakpointLine, {clickOptions: {button: 'right'}});
 
-  await click('aria/Add logpoint…');
+  await devToolsPage.click('aria/Add logpoint…');
 
-  const editDialog = await waitFor('.sources-edit-breakpoint-dialog');
-  const conditionEditor = await waitForAria('Code editor', editDialog);
+  const editDialog = await devToolsPage.waitFor('.sources-edit-breakpoint-dialog');
+  const conditionEditor = await devToolsPage.waitForAria('Code editor', editDialog);
   await conditionEditor.focus();
 
-  await typeText(condition);
-  await frontend.keyboard.press('Enter');
+  await devToolsPage.typeText(condition);
+  await devToolsPage.pressKey('Enter');
 
-  await waitForFunction(async () => await isBreakpointSet(index));
+  await devToolsPage.waitForFunction(async () => await isBreakpointSet(index, devToolsPage));
 }
 
 export async function isBreakpointSet(

test/e2e_non_hosted/console/BUILD.gn

@@ -12,6 +12,7 @@ ts_e2e_library("console") {
     "console-expand-recursively_test.ts",
     "console-fetch-logging_test.ts",
     "console-live-expressions_test.ts",
+    "console-log_test.ts",
     "console-time_test.ts",
     "console-trusted-types_test.ts",
     "console-uncaught-promise_test.ts",