WIP: Enabling test coverage on e2e tests

.travis.yml

@@ -51,7 +51,7 @@ jobs:
     - stage: build
       name: 'Unminified Build'
       script:
-        - unbuffer node build-system/pr-check/unminified-build.js
+        - travis wait 30 unbuffer node build-system/pr-check/unminified-build.js
     - stage: build
       name: 'Checks'
       script:

build-system/pr-check/e2e-tests.js

@@ -67,7 +67,7 @@ async function main() {
     ) {
       downloadDistOutput(FILENAME);
       timedExecOrDie('gulp update-packages');
-      timedExecOrDie('gulp e2e --nobuild --headless --compiled');
+      timedExecOrDie('gulp e2e --nobuild --headless --compiled --coverage');
     } else {
       console.log(
         `${FILELOGPREFIX} Skipping`,

build-system/pr-check/nomodule-build.js

@@ -66,7 +66,10 @@ async function main() {
     ) {
       timedExecOrDie('gulp update-packages');
 
-      const process = timedExecWithError('gulp dist --fortesting', FILENAME);
+      const process = timedExecWithError(
+        'gulp dist --fortesting --coverage',
+        FILENAME
+      );
       if (process.status !== 0) {
         const error = process.error || new Error('unknown error, check logs');
         log(colors.red('ERROR'), colors.yellow(error.message));

build-system/pr-check/unminified-build.js

@@ -60,7 +60,7 @@ function main() {
       buildTargets.has('UNIT_TEST')
     ) {
       timedExecOrDie('gulp update-packages');
-      timedExecOrDie('gulp build --fortesting');
+      timedExecOrDie('gulp build --fortesting --coverage');
       uploadBuildOutput(FILENAME);
     } else {
       log(

build-system/tasks/e2e/describes-e2e.js

@@ -19,26 +19,21 @@ require('geckodriver');
 
 const argv = require('minimist')(process.argv.slice(2));
 const chrome = require('selenium-webdriver/chrome');
-const fetch = require('node-fetch');
 const firefox = require('selenium-webdriver/firefox');
 const puppeteer = require('puppeteer');
 const {
   clearLastExpectError,
   getLastExpectError,
   installBrowserAssertions,
 } = require('./expect');
-const {
-  getCoverageObject,
-  mergeClientCoverage,
-} = require('istanbul-middleware/lib/core');
 const {
   SeleniumWebDriverController,
 } = require('./selenium-webdriver-controller');
 const {AmpDriver, AmpdocEnvironment} = require('./amp-driver');
 const {Builder, Capabilities, logging} = require('selenium-webdriver');
-const {HOST, PORT} = require('../serve');
 const {installRepl, uninstallRepl} = require('./repl');
 const {isTravisBuild} = require('../../common/travis');
+const {mergeClientCoverage} = require('istanbul-middleware/lib/core');
 const {PuppeteerController} = require('./puppeteer-controller');
 
 /** Should have something in the name, otherwise nothing is shown. */
@@ -47,7 +42,6 @@ const TEST_TIMEOUT = 40000;
 const SETUP_TIMEOUT = 30000;
 const SETUP_RETRIES = 3;
 const DEFAULT_E2E_INITIAL_RECT = {width: 800, height: 600};
-const COV_REPORT_PATH = '/coverage/client';
 const supportedBrowsers = new Set(['chrome', 'firefox', 'safari']);
 /**
  * TODO(cvializ): Firefox now experimentally supports puppeteer.
@@ -350,19 +344,6 @@ async function updateCoverage(env) {
   }
 }
 
-/**
- * Reports code coverage data to an aggregating endpoint.
- * @return {Promise<void>}
- */
-async function reportCoverage() {
-  const coverage = getCoverageObject();
-  await fetch(`https://${HOST}:${PORT}${COV_REPORT_PATH}`, {
-    method: 'POST',
-    body: JSON.stringify(coverage),
-    headers: {'Content-type': 'application/json'},
-  });
-}
-
 /**
  * Returns a wrapped version of Mocha's describe(), it() and only() methods
  * that also sets up the provided fixtures and returns the corresponding
@@ -487,12 +468,6 @@ function describeEnv(factory) {
         }
       });
 
-      after(async () => {
-        if (argv.coverage) {
-          await reportCoverage();
-        }
-      });
-
       describe(SUB, function () {
         fn.call(this, env);
       });

build-system/tasks/e2e/index.js

@@ -20,6 +20,7 @@ const argv = require('minimist')(process.argv.slice(2));
 const ciReporter = require('./mocha-ci-reporter');
 const config = require('../../test-configs/config');
 const dotsReporter = require('./mocha-dots-reporter');
+const fetch = require('node-fetch');
 const fs = require('fs');
 const glob = require('glob');
 const http = require('http');
@@ -33,6 +34,7 @@ const {
 } = require('../../common/utils');
 const {cyan} = require('ansi-colors');
 const {execOrDie} = require('../../common/exec');
+const {getCoverageObject} = require('istanbul-middleware/lib/core');
 const {HOST, PORT, startServer, stopServer} = require('../serve');
 const {isTravisBuild} = require('../../common/travis');
 const {maybePrintCoverageMessage} = require('../helpers');
@@ -42,6 +44,7 @@ const {watch} = require('gulp');
 const SLOW_TEST_THRESHOLD_MS = 2500;
 const TEST_RETRIES = isTravisBuild() ? 2 : 0;
 
+const COV_REPORT_PATH = '/coverage/client';
 const COV_DOWNLOAD_PATH = '/coverage/download';
 const COV_OUTPUT_DIR = './test/coverage-e2e';
 const COV_OUTPUT_HTML = path.resolve(COV_OUTPUT_DIR, 'lcov-report/index.html');
@@ -109,6 +112,19 @@ function addMochaFile_(mocha, file) {
   mocha.addFile(file);
 }
 
+/**
+ * Reports code coverage data to an aggregating endpoint.
+ * @return {Promise<void>}
+ */
+async function reportCoverage_() {
+  const coverage = getCoverageObject();
+  await fetch(`http://${HOST}:${PORT}${COV_REPORT_PATH}`, {
+    method: 'POST',
+    body: JSON.stringify(coverage),
+    headers: {'Content-type': 'application/json'},
+  });
+}
+
 /**
  * Fetch aggregated coverage data from server.
  * @param {string} outDir relative path to coverage files directory.
@@ -170,6 +186,7 @@ async function runTests_() {
   return new Promise((resolve) => {
     mocha.run(async (failures) => {
       if (argv.coverage) {
+        await reportCoverage_();
         await fetchCoverage_(COV_OUTPUT_DIR);
         maybePrintCoverageMessage(COV_OUTPUT_HTML);
       }