Migrate test/e2e/console/console-last-result_test.ts

[email protected]

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

Author: OrKoN

test/e2e/console/BUILD.gn

@@ -12,7 +12,6 @@ node_ts_library("console") {
     "console-context-selector_test.ts",
     "console-ignore-list_test.ts",
     "console-insight_test.ts",
-    "console-last-result_test.ts",
     "console-repl-mode_test.ts",
     "issues-toolbar_test.ts",
   ]

test/e2e/console/console-last-result_test.ts

@@ -7,7 +7,6 @@ import {assert} from 'chai';
 import {AsyncScope} from '../../conductor/async-scope.js';
 import type {DevToolsPage} from '../../e2e_non_hosted/shared/frontend-helper.js';
 import {
-  click,
   waitFor,
   waitForFunction
 } from '../../shared/helper.js';
@@ -348,16 +347,16 @@ export async function waitForConsoleInfoMessageAndClickOnLink(
       [veClick('Item: console-message > Link: script-location')], await veRoot(devToolsPage), devToolsPage);
 }
 
-export async function turnOffHistoryAutocomplete() {
-  await click(CONSOLE_SETTINGS_SELECTOR);
-  await click(AUTOCOMPLETE_FROM_HISTORY_SELECTOR);
+export async function turnOffHistoryAutocomplete(devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {
+  await devToolsPage.click(CONSOLE_SETTINGS_SELECTOR);
+  await devToolsPage.click(AUTOCOMPLETE_FROM_HISTORY_SELECTOR);
   await expectVeEvents(
       [
         veClick('Toolbar > ToggleSubpane: console-settings'),
         ...veImpressionsForConsoleSettings(),
         veChange('Toggle: console-history-autocomplete'),
       ],
-      await veRoot());
+      await veRoot(devToolsPage), devToolsPage);
 }
 
 export async function toggleShowCorsErrors(devToolsPage = getBrowserAndPagesWrappers().devToolsPage) {

test/e2e/helpers/console-helpers.ts

@@ -16,6 +16,7 @@ ts_e2e_library("console") {
     "console-expand-recursively_test.ts",
     "console-fetch-logging_test.ts",
     "console-filter_test.ts",
+    "console-last-result_test.ts",
     "console-live-expressions_test.ts",
     "console-log_test.ts",
     "console-stack-trace_test.ts",

test/e2e_non_hosted/console/BUILD.gn

@@ -0,0 +1,44 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {assert} from 'chai';
+
+import {
+  focusConsolePrompt,
+  navigateToConsoleTab,
+  turnOffHistoryAutocomplete,
+  typeIntoConsole,
+  typeIntoConsoleAndWaitForResult,
+} from '../../e2e/helpers/console-helpers.js';
+
+describe('The Console Tab', () => {
+  it('exposes the last evaluation using "$_"', async ({devToolsPage}) => {
+    await navigateToConsoleTab(devToolsPage);
+    await turnOffHistoryAutocomplete(devToolsPage);
+    await focusConsolePrompt(devToolsPage);
+
+    await typeIntoConsoleAndWaitForResult('1+1', undefined, undefined, devToolsPage);
+    await typeIntoConsoleAndWaitForResult('$_', undefined, undefined, devToolsPage);
+
+    let evaluateResults = await devToolsPage.evaluate(() => {
+      return Array.from(document.querySelectorAll('.console-user-command-result')).map(node => node.textContent);
+    });
+    assert.deepEqual(evaluateResults, ['2', '2'], 'did not find expected output in the console');
+
+    await typeIntoConsole('console.clear();', devToolsPage);
+
+    await devToolsPage.waitForFunction(() => {
+      return devToolsPage.evaluate(() => {
+        return document.querySelectorAll('.console-user-command-result').length === 1;
+      });
+    });
+
+    await typeIntoConsoleAndWaitForResult('$_', undefined, undefined, devToolsPage);
+
+    evaluateResults = await devToolsPage.evaluate(() => {
+      return Array.from(document.querySelectorAll('.console-user-command-result')).map(node => node.textContent);
+    });
+    assert.deepEqual(evaluateResults, ['undefined', 'undefined'], 'did not find expected output in the console');
+  });
+});