🏗 Replace dots-style test reporters with the default Spec reporter (#…

…39507)

build-system/tasks/e2e/index.js

@@ -1,9 +1,8 @@
 'use strict';
 
 const argv = require('minimist')(process.argv.slice(2));
-const ciReporter = require('./mocha-ci-reporter');
+const CiReporter = require('./mocha-ci-reporter');
 const config = require('../../test-configs/config');
-const dotsReporter = require('./mocha-dots-reporter');
 const fs = require('fs');
 const glob = require('glob');
 const http = require('http');
@@ -63,15 +62,7 @@ async function setUpTesting_() {
  * @return {!Mocha}
  */
 function createMocha_() {
-  let reporter;
-  if (argv.testnames || argv.watch) {
-    reporter = '';
-  } else if (isCircleciBuild()) {
-    // TODO(#28387) clean up this typing.
-    reporter = /** @type {*} */ (ciReporter);
-  } else {
-    reporter = dotsReporter;
-  }
+  const reporter = isCircleciBuild() ? CiReporter : undefined;
 
   return new Mocha({
     // e2e tests have a different standard for when a test is too slow,

build-system/tasks/e2e/mocha-ci-reporter.js

@@ -1,22 +1,18 @@
+const {reporters} = require('mocha');
 const JsonReporter = require('./mocha-custom-json-reporter');
-const mocha = require('mocha');
-const MochaDotsReporter = require('./mocha-dots-reporter');
 const MochaJUnitReporter = require('mocha-junit-reporter');
-const {Base} = mocha.reporters;
 
-/**
- * @param {*} runner
- * @param {*} options
- * @return {MochaDotsReporter}
- */
-function ciReporter(runner, options) {
-  Base.call(this, runner, options);
-  this._mochaDotsReporter = new MochaDotsReporter(runner);
-  this._jsonReporter = new JsonReporter(runner);
-  this._mochaJunitReporter = new MochaJUnitReporter(runner, options);
-  // TODO(#28387) clean up this typing.
-  return /** @type {*} */ (this);
+class CiReporter extends reporters.Base {
+  /**
+   * @param {import('mocha').Runner} runner
+   * @param {import('mocha').MochaOptions} options
+   */
+  constructor(runner, options) {
+    super(runner, options);
+    this._mochaSpecReporter = new reporters.Spec(runner);
+    this._jsonReporter = new JsonReporter(runner);
+    this._mochaJunitReporter = new MochaJUnitReporter(runner, options);
+  }
 }
-ciReporter.prototype.__proto__ = Base.prototype;
 
-module.exports = ciReporter;
+module.exports = CiReporter;

build-system/test-configs/karma.conf.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const {dotWrappingWidth} = require('../common/logging');
 const {isCiBuild} = require('../common/ci');
 
 const TEST_SERVER_PORT = 8081;
@@ -12,43 +11,15 @@ module.exports = {
 
   hostname: 'localhost',
 
-  reporters: ['super-dots', 'spec'],
-
-  superDotsReporter: {
-    nbDotsPerLine: dotWrappingWidth,
-    color: {
-      success: 'green',
-      failure: 'red',
-      ignore: 'yellow',
-    },
-    icon: {
-      success: '●',
-      failure: '●',
-      ignore: '○',
-    },
-  },
+  reporters: ['spec'],
 
   specReporter: {
-    suppressPassed: true,
-    suppressSkipped: true,
-    suppressFailed: false,
-    suppressErrorSummary: true,
     maxLogLines: 20,
   },
 
   mochaReporter: {
     output: 'full',
     divider: false,
-    colors: {
-      success: 'green',
-      error: 'red',
-      info: 'yellow',
-    },
-    symbols: {
-      success: '●',
-      error: '●',
-      info: '○',
-    },
   },
 
   port: 9876,
@@ -114,6 +85,5 @@ module.exports = {
     'karma-safarinative-launcher',
     'karma-source-map-support',
     'karma-spec-reporter',
-    'karma-super-dots-reporter',
   ],
 };