Skip to content

Commit 73015e5

Browse files
authored
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
1 parent 09c5568 commit 73015e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+854
-952
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
strategy:
4343
matrix:
44-
ts-version: [~3.7.5, ~3.8, ~3.9, ~4.0]
44+
ts-version: [~3.7.5, ~3.8, ~3.9, ~4.0, ~4.1]
4545
steps:
4646
- uses: actions/checkout@v1
4747
with:

lib/api.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,11 @@ class Api extends Emittery {
117117
cacheDir = this._createCacheDir();
118118
testFiles = await globs.findTests({cwd: this.options.projectDir, ...apiOptions.globs});
119119
if (selectedFiles.length === 0) {
120-
if (filter.length === 0) {
121-
selectedFiles = testFiles;
122-
} else {
123-
selectedFiles = globs.applyTestFileFilter({
124-
cwd: this.options.projectDir,
125-
filter: filter.map(({pattern}) => pattern),
126-
testFiles
127-
});
128-
}
120+
selectedFiles = filter.length === 0 ? testFiles : globs.applyTestFileFilter({
121+
cwd: this.options.projectDir,
122+
filter: filter.map(({pattern}) => pattern),
123+
testFiles
124+
});
129125
}
130126
} catch (error) {
131127
selectedFiles = [];

lib/cli.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -409,22 +409,17 @@ exports.run = async () => { // eslint-disable-line complexity
409409
workerArgv: argv['--']
410410
});
411411

412-
let reporter;
413-
if (combined.tap && !combined.watch && debug === null) {
414-
reporter = new TapReporter({
415-
projectDir,
416-
reportStream: process.stdout,
417-
stdStream: process.stderr
418-
});
419-
} else {
420-
reporter = new DefaultReporter({
421-
projectDir,
422-
reportStream: process.stdout,
423-
stdStream: process.stderr,
424-
watching: combined.watch,
425-
verbose: debug !== null || combined.verbose || isCi || !process.stdout.isTTY
426-
});
427-
}
412+
const reporter = combined.tap && !combined.watch && debug === null ? new TapReporter({
413+
projectDir,
414+
reportStream: process.stdout,
415+
stdStream: process.stderr
416+
}) : new DefaultReporter({
417+
projectDir,
418+
reportStream: process.stdout,
419+
stdStream: process.stderr,
420+
watching: combined.watch,
421+
verbose: debug !== null || combined.verbose || isCi || !process.stdout.isTTY
422+
});
428423

429424
api.on('run', plan => {
430425
reporter.startRun(plan);

lib/concordance-options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const util = require('util');
2+
const util = require('util'); // eslint-disable-line unicorn/import-style
33
const ansiStyles = require('ansi-styles');
44
const stripAnsi = require('strip-ansi');
55
const cloneDeepWith = require('lodash/cloneDeepWith');

lib/globs.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ function normalizeGlobs({extensions, files: filePatterns, ignoredByWatcher: igno
8282
filePatterns = defaultTestPatterns;
8383
}
8484

85-
if (ignoredByWatcherPatterns) {
86-
ignoredByWatcherPatterns = [...defaultIgnoredByWatcherPatterns, ...normalizePatterns(ignoredByWatcherPatterns)];
87-
} else {
88-
ignoredByWatcherPatterns = [...defaultIgnoredByWatcherPatterns];
89-
}
85+
ignoredByWatcherPatterns = ignoredByWatcherPatterns ? [...defaultIgnoredByWatcherPatterns, ...normalizePatterns(ignoredByWatcherPatterns)] : [...defaultIgnoredByWatcherPatterns];
9086

9187
for (const {level, main} of providers) {
9288
if (level >= providerManager.levels.pathRewrites) {

lib/plugin-support/shared-worker-loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const {EventEmitter, on} = require('events');
22
const v8 = require('v8');
3-
const {workerData, parentPort} = require('worker_threads'); // eslint-disable-line node/no-unsupported-features/node-builtins
3+
const {workerData, parentPort} = require('worker_threads');
44
const pkg = require('../../package.json');
55

66
// Used to forward messages received over the `parentPort`. Every subscription

lib/plugin-support/shared-workers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const serializeError = require('../serialize-error');
33

44
let Worker;
55
try {
6-
({Worker} = require('worker_threads')); // eslint-disable-line node/no-unsupported-features/node-builtins
6+
({Worker} = require('worker_threads'));
77
} catch {}
88

99
const LOADER = require.resolve('./shared-worker-loader');

lib/test.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,8 @@ class Test {
298298
};
299299
}
300300

301-
if (this.metadata.inline) {
302-
throw new Error('`t.end()` is not supported inside `t.try()`');
303-
} else {
304-
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)`');
305-
}
301+
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)`');
302+
throw error_;
306303
}
307304

308305
endCallback(error, savedError) {
@@ -736,11 +733,7 @@ class Test {
736733
if (this.metadata.failing) {
737734
passed = !passed;
738735

739-
if (passed) {
740-
error = null;
741-
} else {
742-
error = new Error('Test was expected to fail, but succeeded, you should stop marking the test as failing');
743-
}
736+
error = passed ? null : new Error('Test was expected to fail, but succeeded, you should stop marking the test as failing');
744737
}
745738

746739
return {

0 commit comments

Comments
 (0)