Update dependencies & fix reporter tests

* Fix reporter tests under Node.js 15 Fixes #2616. * Update dev dependencies * Update XO * Update TypeScript * Update dependencies * Rebuild package lock * Churn reporter logs
avajs · Nov 30, 2020 · 73015e5 · 73015e5
1 parent 09c5568
commit 73015e5
Show file tree

Hide file tree

Showing 42 changed files with 854 additions and 952 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ts-version: [~3.7.5, ~3.8, ~3.9, ~4.0]
+        ts-version: [~3.7.5, ~3.8, ~3.9, ~4.0, ~4.1]
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/lib/api.js b/lib/api.js
@@ -117,15 +117,11 @@ class Api extends Emittery {
 			cacheDir = this._createCacheDir();
 			testFiles = await globs.findTests({cwd: this.options.projectDir, ...apiOptions.globs});
 			if (selectedFiles.length === 0) {
-				if (filter.length === 0) {
-					selectedFiles = testFiles;
-				} else {
-					selectedFiles = globs.applyTestFileFilter({
-						cwd: this.options.projectDir,
-						filter: filter.map(({pattern}) => pattern),
-						testFiles
-					});
-				}
+				selectedFiles = filter.length === 0 ? testFiles : globs.applyTestFileFilter({
+					cwd: this.options.projectDir,
+					filter: filter.map(({pattern}) => pattern),
+					testFiles
+				});
 			}
 		} catch (error) {
 			selectedFiles = [];

diff --git a/lib/cli.js b/lib/cli.js
@@ -409,22 +409,17 @@ exports.run = async () => { // eslint-disable-line complexity
 		workerArgv: argv['--']
 	});
 
-	let reporter;
-	if (combined.tap && !combined.watch && debug === null) {
-		reporter = new TapReporter({
-			projectDir,
-			reportStream: process.stdout,
-			stdStream: process.stderr
-		});
-	} else {
-		reporter = new DefaultReporter({
-			projectDir,
-			reportStream: process.stdout,
-			stdStream: process.stderr,
-			watching: combined.watch,
-			verbose: debug !== null || combined.verbose || isCi || !process.stdout.isTTY
-		});
-	}
+	const reporter = combined.tap && !combined.watch && debug === null ? new TapReporter({
+		projectDir,
+		reportStream: process.stdout,
+		stdStream: process.stderr
+	}) : new DefaultReporter({
+		projectDir,
+		reportStream: process.stdout,
+		stdStream: process.stderr,
+		watching: combined.watch,
+		verbose: debug !== null || combined.verbose || isCi || !process.stdout.isTTY
+	});
 
 	api.on('run', plan => {
 		reporter.startRun(plan);

diff --git a/lib/concordance-options.js b/lib/concordance-options.js
@@ -1,5 +1,5 @@
 'use strict';
-const util = require('util');
+const util = require('util'); // eslint-disable-line unicorn/import-style
 const ansiStyles = require('ansi-styles');
 const stripAnsi = require('strip-ansi');
 const cloneDeepWith = require('lodash/cloneDeepWith');

diff --git a/lib/globs.js b/lib/globs.js
@@ -82,11 +82,7 @@ function normalizeGlobs({extensions, files: filePatterns, ignoredByWatcher: igno
 		filePatterns = defaultTestPatterns;
 	}
 
-	if (ignoredByWatcherPatterns) {
-		ignoredByWatcherPatterns = [...defaultIgnoredByWatcherPatterns, ...normalizePatterns(ignoredByWatcherPatterns)];
-	} else {
-		ignoredByWatcherPatterns = [...defaultIgnoredByWatcherPatterns];
-	}
+	ignoredByWatcherPatterns = ignoredByWatcherPatterns ? [...defaultIgnoredByWatcherPatterns, ...normalizePatterns(ignoredByWatcherPatterns)] : [...defaultIgnoredByWatcherPatterns];
 
 	for (const {level, main} of providers) {
 		if (level >= providerManager.levels.pathRewrites) {

diff --git a/lib/plugin-support/shared-worker-loader.js b/lib/plugin-support/shared-worker-loader.js
@@ -1,6 +1,6 @@
 const {EventEmitter, on} = require('events');
 const v8 = require('v8');
-const {workerData, parentPort} = require('worker_threads'); // eslint-disable-line node/no-unsupported-features/node-builtins
+const {workerData, parentPort} = require('worker_threads');
 const pkg = require('../../package.json');
 
 // Used to forward messages received over the `parentPort`. Every subscription

diff --git a/lib/plugin-support/shared-workers.js b/lib/plugin-support/shared-workers.js
@@ -3,7 +3,7 @@ const serializeError = require('../serialize-error');
 
 let Worker;
 try {
-	({Worker} = require('worker_threads')); // eslint-disable-line node/no-unsupported-features/node-builtins
+	({Worker} = require('worker_threads'));
 } catch {}
 
 const LOADER = require.resolve('./shared-worker-loader');

diff --git a/lib/test.js b/lib/test.js
@@ -298,11 +298,8 @@ class Test {
 			};
 		}
 
-		if (this.metadata.inline) {
-			throw new Error('`t.end()` is not supported inside `t.try()`');
-		} else {
-			throw new Error('`t.end()` is not supported in this context. To use `t.end()` as a callback, you must use "callback mode" via `test.cb(testName, fn)`');
-		}
+		const error_ = this.metadata.inline ? new Error('`t.end()` is not supported inside `t.try()`') : new Error('`t.end()` is not supported in this context. To use `t.end()` as a callback, you must use "callback mode" via `test.cb(testName, fn)`');
+		throw error_;
 	}
 
 	endCallback(error, savedError) {
@@ -736,11 +733,7 @@ class Test {
 		if (this.metadata.failing) {
 			passed = !passed;
 
-			if (passed) {
-				error = null;
-			} else {
-				error = new Error('Test was expected to fail, but succeeded, you should stop marking the test as failing');
-			}
+			error = passed ? null : new Error('Test was expected to fail, but succeeded, you should stop marking the test as failing');
 		}
 
 		return {