Migrate assertion tests to non-hosted e2e tests

Bug: 390535614
Change-Id: I31ce63a320f2346b759f1db5d3a5826e8e43a95d
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6298134
Commit-Queue: Liviu Rau <[email protected]>
Reviewed-by: Alex Rudenko <[email protected]>
Reviewed-by: Simon Zünd <[email protected]>

Author: Liviu Rau

test/conductor/events.ts

@@ -181,6 +181,9 @@ function formatStackFrame(stackFrame: puppeteer.ConsoleMessageLocation): string
 }
 
 export function dumpCollectedErrors(): void {
+  if (!(expectedErrors.length + fatalErrors.length)) {
+    return;
+  }
   console.log('Expected errors: ' + expectedErrors.length);
   console.log('   Fatal errors: ' + fatalErrors.length);
   if (fatalErrors.length) {
@@ -190,11 +193,13 @@ export function dumpCollectedErrors(): void {
     console.log(
         '\nErrors from component examples during test run:\n', uiComponentDocErrors.map(e => e.message).join('\n  '));
   }
+  expectedErrors = [];
+  fatalErrors = [];
 }
 
 const pendingErrorExpectations = new Set<ErrorExpectation>();
-export const fatalErrors: string[] = [];
-export const expectedErrors: string[] = [];
+export let fatalErrors: string[] = [];
+export let expectedErrors: string[] = [];
 // Gathered separately so we can surface them during screenshot tests to help
 // give an idea of failures, rather than having to guess purely based on the
 // screenshot.

test/e2e/BUILD.gn

@@ -18,7 +18,6 @@ node_ts_library("tests") {
     "ai_assistance",
     "animations",
     "application",
-    "assertion",
     "changes",
     "console",
     "coverage",

test/e2e/assertion/assertion_test.ts

@@ -15,6 +15,7 @@ group("e2e_non_hosted") {
 node_ts_library("tests") {
   deps = [
     "../conductor:implementation",
+    "assertion",
     "dummy",
   ]
   sources = [ "mocharc.ts" ]

test/e2e_non_hosted/BUILD.gn

@@ -4,11 +4,10 @@
 
 import("../../../scripts/build/typescript/typescript.gni")
 
-node_ts_library("assertion") {
+ts_e2e_library("assertion") {
   sources = [ "assertion_test.ts" ]
-
   deps = [
-    "../../shared",
-    "../helpers",
+    "../../conductor:implementation",
+    "../shared",
   ]
 }

test/e2e/assertion/BUILD.gn test/e2e_non_hosted/assertion/BUILD.gntest/e2e/assertion/BUILD.gn renamed to test/e2e_non_hosted/assertion/BUILD.gn

@@ -0,0 +1,28 @@
+// 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 {expectedErrors} from '../../conductor/events.js';
+
+describe('Assertions', function() {
+  it('console.assert', async ({devToolsPage, inspectedPage}) => {
+    await devToolsPage.evaluate(() => {
+      console.assert(false, 'expected failure 1');
+    });
+    await inspectedPage.goToResource('cross_tool/default.html');
+    assert.isOk(expectedErrors.some(error => error.includes('expected failure 1')));
+  });
+
+  it('console.error', async ({devToolsPage, inspectedPage}) => {
+    await devToolsPage.evaluate(() => {
+      function foo() {
+        console.error('expected failure 2');
+      }
+      foo();
+    });
+    await inspectedPage.goToResource('cross_tool/default.html');
+    assert.isOk(expectedErrors.some(error => error.includes('expected failure 2')));
+  });
+});

test/e2e_non_hosted/assertion/assertion_test.ts

@@ -52,7 +52,7 @@ export class StateProvider {
   debugNotice: DebugModeNotice;
   settingsCallbackMap: Map<Mocha.Suite, E2E.SuiteSettings>;
   browserMap: Map<string, BrowserWrapper>;
-  static serverPort: Number;
+  static serverPort: number;
 
   private constructor() {
     this.debugNotice = new DebugModeNotice();
@@ -87,7 +87,7 @@ export class StateProvider {
     const browserKey = JSON.stringify(browserSettings);
     let browser = this.browserMap.get(browserKey);
     if (!browser) {
-      browser = await Launcher.browserSetup(browserSettings, StateProvider.serverPort);
+      browser = await Launcher.browserSetup(browserSettings);
       this.browserMap.set(browserKey, browser);
     }
     // Suite needs to be aware of the browser instance to be able to create the
@@ -99,7 +99,7 @@ export class StateProvider {
     const settings = await this.getSettings(suite);
     const browser = suite.browser;
     const browsingContext = await browser.createBrowserContext();
-    const inspectedPage = await setupInspectedPage(browsingContext);
+    const inspectedPage = await setupInspectedPage(browsingContext, StateProvider.serverPort);
     const devToolsPage = await setupDevToolsPage(browsingContext, settings);
     const state = {
       devToolsPage,

test/e2e_non_hosted/conductor/state-provider.ts

@@ -13,7 +13,7 @@ import {TestConfig} from '../../conductor/test_config.js';
 export class BrowserWrapper {
   browser: puppeteer.Browser;
 
-  constructor(b: puppeteer.Browser, readonly serverPort: Number) {
+  constructor(b: puppeteer.Browser) {
     this.browser = b;
   }
 
@@ -22,14 +22,14 @@ export class BrowserWrapper {
   }
 }
 export class Launcher {
-  static async browserSetup(settings: BrowserSettings, serverPort: Number) {
+  static async browserSetup(settings: BrowserSettings) {
     const browser = await Launcher.launchChrome(settings);
     setupBrowserProcessIO(browser);
     // Close default devtools.
     const devToolsTarget = await browser.waitForTarget(target => target.url().startsWith('devtools://'));
     const page = await devToolsTarget.page();
     await page?.close();
-    return new BrowserWrapper(browser, serverPort);
+    return new BrowserWrapper(browser);
   }
 
   private static launchChrome(settings: BrowserSettings) {

test/e2e_non_hosted/shared/browser-helper.ts

@@ -7,10 +7,24 @@ import type * as puppeteer from 'puppeteer-core';
 import {PageWrapper} from './page-wrapper.js';
 
 export class InspectedPage extends PageWrapper {
-  // Place to port current "target" page helper functions to.
+  constructor(page: puppeteer.Page, readonly serverPort: number) {
+    super(page);
+    this.serverPort = serverPort;
+  }
+  async goTo(url: string, options: puppeteer.WaitForOptions = {}) {
+    await this.page.goto(url, options);
+  }
+
+  async goToResource(path: string, options: puppeteer.WaitForOptions = {}) {
+    await this.goTo(`${this.getResourcesPath()}/${path}`, options);
+  }
+
+  getResourcesPath(host = 'localhost') {
+    return `https://${host}:${this.serverPort}/test/e2e/resources`;
+  }
 }
 
-export async function setupInspectedPage(context: puppeteer.BrowserContext) {
-  const target = await context.newPage();
-  return new InspectedPage(target);
+export async function setupInspectedPage(context: puppeteer.BrowserContext, serverPort: number) {
+  const page = await context.newPage();
+  return new InspectedPage(page, serverPort);
 }