Migrate console-stack-trace_test.ts

[email protected]

Fixed: 416405553
Change-Id: I9758d9e9b932455042cfdbe53648f4f1a78253f5
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6700539
Auto-Submit: Alex Rudenko <[email protected]>
Commit-Queue: Philip Pfaffe <[email protected]>
Reviewed-by: Philip Pfaffe <[email protected]>

Author: OrKoN

test/e2e/console/BUILD.gn

@@ -14,7 +14,6 @@ node_ts_library("console") {
     "console-insight_test.ts",
     "console-last-result_test.ts",
     "console-repl-mode_test.ts",
-    "console-stack-trace_test.ts",
     "issues-toolbar_test.ts",
   ]
 

test/e2e_non_hosted/console/BUILD.gn

@@ -18,7 +18,7 @@ ts_e2e_library("console") {
     "console-filter_test.ts",
     "console-live-expressions_test.ts",
     "console-log_test.ts",
-    "console-message-format_test.ts",
+    "console-stack-trace_test.ts",
     "console-time_test.ts",
     "console-truncate-long-messages_test.ts",
     "console-trusted-types_test.ts",

test/e2e/console/console-stack-trace_test.ts renamed to test/e2e_non_hosted/console/console-stack-trace_test.ts

@@ -4,9 +4,12 @@
 
 import {assert} from 'chai';
 
-import {$, click, getBrowserAndPages, goToResource, typeText, waitForFunction} from '../../shared/helper.js';
-import {CONSOLE_TAB_SELECTOR, focusConsolePrompt, STACK_PREVIEW_CONTAINER} from '../helpers/console-helpers.js';
-import {openSettingsTab} from '../helpers/settings-helpers.js';
+import {
+  CONSOLE_TAB_SELECTOR,
+  focusConsolePrompt,
+  STACK_PREVIEW_CONTAINER,
+} from '../../e2e/helpers/console-helpers.js';
+import {openSettingsTab} from '../../e2e/helpers/settings-helpers.js';
 
 const CONSOLE_MESSAGE_WRAPPER = '.console-message-stack-trace-wrapper';
 const ADD_FILENAME_PATTERN_BUTTON = 'devtools-button[aria-label="Add a regular expression rule for the script\'s URL"]';
@@ -16,15 +19,14 @@ const SHOW_MORE_LINK = '.show-all-link .link';
 const SHOW_LESS_LINK = '.show-less-link .link';
 
 describe('The Console Tab', () => {
-  it('shows messages with stack traces', async () => {
-    const {frontend} = getBrowserAndPages();
-    await click(CONSOLE_TAB_SELECTOR);
-    await focusConsolePrompt();
-    await goToResource('console/stack-trace.html');
+  it('shows messages with stack traces', async ({devToolsPage, inspectedPage}) => {
+    await devToolsPage.click(CONSOLE_TAB_SELECTOR);
+    await focusConsolePrompt(devToolsPage);
+    await inspectedPage.goToResource('console/stack-trace.html');
 
-    await frontend.waitForSelector(CONSOLE_MESSAGE_WRAPPER);
-    await click(CONSOLE_MESSAGE_WRAPPER);
-    const stack = await $(STACK_PREVIEW_CONTAINER);
+    await devToolsPage.waitFor(CONSOLE_MESSAGE_WRAPPER);
+    await devToolsPage.click(CONSOLE_MESSAGE_WRAPPER);
+    const stack = await devToolsPage.$(STACK_PREVIEW_CONTAINER);
 
     const expected = [
       {text: '\nshown3 @ showMe.js:10', visible: true},
@@ -41,29 +43,28 @@ describe('The Console Tab', () => {
       {text: '', visible: false},
     ];
 
-    await waitForFunction(async () => {
-      const stackTraceRows = await frontend.evaluate((stack: Element) => {
+    await devToolsPage.waitForFunction(async () => {
+      const stackTraceRows = await devToolsPage.evaluate((stack: Element) => {
         return Array.from(stack.querySelectorAll('tr'))
             .map(node => ({text: node.textContent, visible: node.checkVisibility()}));
       }, stack);
       return JSON.stringify(stackTraceRows) === JSON.stringify(expected);
     });
   });
 
-  it('shows messages with stack traces containing ignore-listed frames', async () => {
-    const {frontend} = getBrowserAndPages();
-    await openSettingsTab('Ignore list');
-    await click(ADD_FILENAME_PATTERN_BUTTON);
-    await typeText('ignoreMe.js');
-    await click(ADD_BUTTON);
-    await click(CLOSE_SETTINGS_BUTTON);
+  it('shows messages with stack traces containing ignore-listed frames', async ({devToolsPage, inspectedPage}) => {
+    await openSettingsTab('Ignore list', devToolsPage);
+    await devToolsPage.click(ADD_FILENAME_PATTERN_BUTTON);
+    await devToolsPage.typeText('ignoreMe.js');
+    await devToolsPage.click(ADD_BUTTON);
+    await devToolsPage.click(CLOSE_SETTINGS_BUTTON);
 
-    await goToResource('console/stack-trace.html');
-    await click(CONSOLE_TAB_SELECTOR);
+    await inspectedPage.goToResource('console/stack-trace.html');
+    await devToolsPage.click(CONSOLE_TAB_SELECTOR);
 
-    await frontend.waitForSelector(CONSOLE_MESSAGE_WRAPPER);
-    await click(CONSOLE_MESSAGE_WRAPPER);
-    const stack = await $(STACK_PREVIEW_CONTAINER);
+    await devToolsPage.waitFor(CONSOLE_MESSAGE_WRAPPER);
+    await devToolsPage.click(CONSOLE_MESSAGE_WRAPPER);
+    const stack = await devToolsPage.$(STACK_PREVIEW_CONTAINER);
 
     const expected = [
       {text: '\nshown3 @ showMe.js:10', visible: true},
@@ -80,8 +81,8 @@ describe('The Console Tab', () => {
       {text: '', visible: false},
     ];
 
-    await waitForFunction(async () => {
-      const stackTraceRows = await frontend.evaluate((stack: Element) => {
+    await devToolsPage.waitForFunction(async () => {
+      const stackTraceRows = await devToolsPage.evaluate((stack: Element) => {
         return Array.from(stack.querySelectorAll('tr'))
             .map(node => ({text: node.textContent, visible: node.checkVisibility()}));
       }, stack);
@@ -93,7 +94,7 @@ describe('The Console Tab', () => {
     assert.isFalse(showHidden);
 
     // assert that after clicking 'show all'-button, hidden rows are shown
-    await click(SHOW_MORE_LINK);
+    await devToolsPage.click(SHOW_MORE_LINK);
     showHidden = stack ? await stack.evaluate(x => x.classList.contains('show-hidden-rows')) : null;
     assert.isTrue(showHidden);
 
@@ -112,16 +113,16 @@ describe('The Console Tab', () => {
       {text: '', visible: true},
     ];
 
-    await waitForFunction(async () => {
-      const stackTraceRows = await frontend.evaluate((stack: Element) => {
+    await devToolsPage.waitForFunction(async () => {
+      const stackTraceRows = await devToolsPage.evaluate((stack: Element) => {
         return Array.from(stack.querySelectorAll('tr'))
             .map(node => ({text: node.textContent, visible: node.checkVisibility()}));
       }, stack);
       return JSON.stringify(stackTraceRows) === JSON.stringify(expectedUnhidden);
     });
 
     // assert that after clicking 'show less'-button, hidden rows are hidden again
-    await click(SHOW_LESS_LINK);
+    await devToolsPage.click(SHOW_LESS_LINK);
     showHidden = stack ? await stack.evaluate(x => x.classList.contains('show-hidden-rows')) : null;
     assert.isFalse(showHidden);
   });