From 9546be54240d24cf17eadf4a189efa5f3d40a7e0 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 18 Jan 2021 17:40:16 +0100 Subject: [PATCH 1/2] feat(reporters): add static filepath property to all reporters --- CHANGELOG.md | 3 ++- packages/jest-core/src/TestScheduler.ts | 4 ++-- packages/jest-reporters/src/CoverageReporter.ts | 2 ++ packages/jest-reporters/src/DefaultReporter.ts | 2 ++ packages/jest-reporters/src/NotifyReporter.ts | 2 ++ packages/jest-reporters/src/SummaryReporter.ts | 2 ++ packages/jest-reporters/src/VerboseReporter.ts | 2 ++ 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4561dd6d92bc..909f188e4cd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,10 +13,11 @@ - `[jest-haste-map]` Handle injected scm clocks ([#10966](https://github.com/facebook/jest/pull/10966)) - `[jest-repl, jest-runner]` [**BREAKING**] Run transforms over environment ([#8751](https://github.com/facebook/jest/pull/8751)) - `[jest-runner]` [**BREAKING**] set exit code to 1 if test logs after teardown ([#10728](https://github.com/facebook/jest/pull/10728)) -- `[jest-snapshot]` [**BREAKING**] Make prettier optional for inline snapshots - fall back to string replacement ([#7792](https://github.com/facebook/jest/pull/7792)) - `[jest-runner]` [**BREAKING**] Run transforms over `runnner` ([#8823](https://github.com/facebook/jest/pull/8823)) - `[jest-runner]` [**BREAKING**] Run transforms over `testRunnner` ([#8823](https://github.com/facebook/jest/pull/8823)) - `[jest-runtime, jest-transform]` share `cacheFS` between runtime and transformer ([#10901](https://github.com/facebook/jest/pull/10901)) +- `[jest-reporters]` Add static filepath property to all reporters +- `[jest-snapshot]` [**BREAKING**] Make prettier optional for inline snapshots - fall back to string replacement ([#7792](https://github.com/facebook/jest/pull/7792)) - `[jest-transform]` Pass config options defined in Jest's config to transformer's `process` and `getCacheKey` functions ([#10926](https://github.com/facebook/jest/pull/10926)) - `[jest-worker]` Add support for custom task queues and adds a `PriorityQueue` implementation. ([#10921](https://github.com/facebook/jest/pull/10921)) - `[jest-worker]` Add in-order scheduling policy to jest worker ([10902](https://github.com/facebook/jest/pull/10902)) diff --git a/packages/jest-core/src/TestScheduler.ts b/packages/jest-core/src/TestScheduler.ts index 8afb21af452d..a6e06a3b2883 100644 --- a/packages/jest-core/src/TestScheduler.ts +++ b/packages/jest-core/src/TestScheduler.ts @@ -458,11 +458,11 @@ const createAggregatedResults = (numTotalTestSuites: number) => { }; const getEstimatedTime = (timings: Array, workers: number) => { - if (!timings.length) { + if (timings.length === 0) { return 0; } - const max = Math.max.apply(null, timings); + const max = Math.max(...timings); return timings.length <= workers ? max : Math.max(timings.reduce((sum, time) => sum + time) / workers, max); diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts index 034ab6ae9802..1883b39861e4 100644 --- a/packages/jest-reporters/src/CoverageReporter.ts +++ b/packages/jest-reporters/src/CoverageReporter.ts @@ -50,6 +50,8 @@ export default class CoverageReporter extends BaseReporter { private _options: CoverageReporterOptions; private _v8CoverageResults: Array; + static readonly filename = __filename; + constructor( globalConfig: Config.GlobalConfig, options?: CoverageReporterOptions, diff --git a/packages/jest-reporters/src/DefaultReporter.ts b/packages/jest-reporters/src/DefaultReporter.ts index 84f074f88d1e..77b1fbe94b46 100644 --- a/packages/jest-reporters/src/DefaultReporter.ts +++ b/packages/jest-reporters/src/DefaultReporter.ts @@ -33,6 +33,8 @@ export default class DefaultReporter extends BaseReporter { private _status: Status; private _bufferedOutput: Set; + static readonly filename = __filename; + constructor(globalConfig: Config.GlobalConfig) { super(); this._globalConfig = globalConfig; diff --git a/packages/jest-reporters/src/NotifyReporter.ts b/packages/jest-reporters/src/NotifyReporter.ts index 16ba761c34a5..f24967a00914 100644 --- a/packages/jest-reporters/src/NotifyReporter.ts +++ b/packages/jest-reporters/src/NotifyReporter.ts @@ -24,6 +24,8 @@ export default class NotifyReporter extends BaseReporter { private _globalConfig: Config.GlobalConfig; private _context: TestSchedulerContext; + static readonly filename = __filename; + constructor( globalConfig: Config.GlobalConfig, startRun: (globalConfig: Config.GlobalConfig) => unknown, diff --git a/packages/jest-reporters/src/SummaryReporter.ts b/packages/jest-reporters/src/SummaryReporter.ts index f145e3b1820a..1064e759da21 100644 --- a/packages/jest-reporters/src/SummaryReporter.ts +++ b/packages/jest-reporters/src/SummaryReporter.ts @@ -54,6 +54,8 @@ export default class SummaryReporter extends BaseReporter { private _estimatedTime: number; private _globalConfig: Config.GlobalConfig; + static readonly filename = __filename; + constructor(globalConfig: Config.GlobalConfig) { super(); this._globalConfig = globalConfig; diff --git a/packages/jest-reporters/src/VerboseReporter.ts b/packages/jest-reporters/src/VerboseReporter.ts index ef74577e6db3..5d7de322f330 100644 --- a/packages/jest-reporters/src/VerboseReporter.ts +++ b/packages/jest-reporters/src/VerboseReporter.ts @@ -22,6 +22,8 @@ const {ICONS} = specialChars; export default class VerboseReporter extends DefaultReporter { protected _globalConfig: Config.GlobalConfig; + static readonly filename = __filename; + constructor(globalConfig: Config.GlobalConfig) { super(globalConfig); this._globalConfig = globalConfig; From c7686c6dcae1d8f14b419d61b23db19941ff8c49 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 18 Jan 2021 17:48:17 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 909f188e4cd2..75f2f2a810f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ - `[jest-runner]` [**BREAKING**] Run transforms over `runnner` ([#8823](https://github.com/facebook/jest/pull/8823)) - `[jest-runner]` [**BREAKING**] Run transforms over `testRunnner` ([#8823](https://github.com/facebook/jest/pull/8823)) - `[jest-runtime, jest-transform]` share `cacheFS` between runtime and transformer ([#10901](https://github.com/facebook/jest/pull/10901)) -- `[jest-reporters]` Add static filepath property to all reporters +- `[jest-reporters]` Add static filepath property to all reporters ([#11015](https://github.com/facebook/jest/pull/11015)) - `[jest-snapshot]` [**BREAKING**] Make prettier optional for inline snapshots - fall back to string replacement ([#7792](https://github.com/facebook/jest/pull/7792)) - `[jest-transform]` Pass config options defined in Jest's config to transformer's `process` and `getCacheKey` functions ([#10926](https://github.com/facebook/jest/pull/10926)) - `[jest-worker]` Add support for custom task queues and adds a `PriorityQueue` implementation. ([#10921](https://github.com/facebook/jest/pull/10921))