diff --git a/src/server/cli/test-runner.js b/src/server/cli/test-runner.js index 64a669bc..02eb1797 100755 --- a/src/server/cli/test-runner.js +++ b/src/server/cli/test-runner.js @@ -120,13 +120,6 @@ async function getTestRunnerOptions(argv = []) { type: Boolean, description: 'Run tests in Webkit', order: 4 - }, - { - name: 'test-reporting', - type: Boolean, - defaultOption: false, - description: 'Enables generating a D2L Test Reporting format JSON file', - order: 14 } ]; diff --git a/src/server/wtr-config.js b/src/server/wtr-config.js index 6932126e..99de398d 100644 --- a/src/server/wtr-config.js +++ b/src/server/wtr-config.js @@ -1,4 +1,5 @@ import { defaultReporter } from '@web/test-runner'; +import { env } from 'node:process'; import { headedMode } from './headed-mode-plugin.js'; import { playwrightLauncher } from '@web/test-runner-playwright'; import { reporter as testReportingReporter } from 'd2l-test-reporting/reporters/web-test-runner.js'; @@ -6,6 +7,7 @@ import { visualDiff } from './visual-diff-plugin.js'; import { visualDiffReporter } from './visual-diff-reporter.js'; const DEFAULT_PATTERN = type => `./test/**/*.${type}.js`; +const DEFAULT_TEST_REPORTING = !!env['CI']; const BROWSER_MAP = { chrome: 'chromium', chromium: 'chromium', @@ -182,7 +184,7 @@ export class WTRConfig { pattern = DEFAULT_PATTERN, slow, timeout, - testReporting, + testReporting = DEFAULT_TEST_REPORTING, ...passthroughConfig } = {}) { @@ -215,8 +217,6 @@ export class WTRConfig { }); } - testReporting = !!testReporting || this.#cliArgs['test-reporting']; - if (group === 'vdiff' || testReporting) { config.reporters ??= [ defaultReporter() ]; }