From bb026ef9e32c6cc9f463c64bd7540bc52094d72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Thu, 5 Nov 2020 22:59:36 +0100 Subject: [PATCH 1/4] chore(breaking): remove undocumented enabledTestsMap config --- packages/jest-config/src/index.ts | 1 - packages/jest-core/src/FailedTestsCache.ts | 9 --------- .../jest-core/src/__tests__/FailedTestsCache.test.js | 6 ------ packages/jest-core/src/__tests__/watch.test.js | 1 - packages/jest-core/src/runJest.ts | 1 - packages/jest-jasmine2/src/index.ts | 9 +-------- packages/jest-types/src/Config.ts | 5 ----- packages/test-utils/src/config.ts | 1 - 8 files changed, 1 insertion(+), 32 deletions(-) diff --git a/packages/jest-config/src/index.ts b/packages/jest-config/src/index.ts index 2d3212933f2b..eac57f2fd94a 100644 --- a/packages/jest-config/src/index.ts +++ b/packages/jest-config/src/index.ts @@ -123,7 +123,6 @@ const groupOptions = ( coverageThreshold: options.coverageThreshold, detectLeaks: options.detectLeaks, detectOpenHandles: options.detectOpenHandles, - enabledTestsMap: options.enabledTestsMap, errorOnDeprecated: options.errorOnDeprecated, expand: options.expand, filter: options.filter, diff --git a/packages/jest-core/src/FailedTestsCache.ts b/packages/jest-core/src/FailedTestsCache.ts index 13915707ad84..5d2098a2cd12 100644 --- a/packages/jest-core/src/FailedTestsCache.ts +++ b/packages/jest-core/src/FailedTestsCache.ts @@ -38,13 +38,4 @@ export default class FailedTestsCache { this._enabledTestsMap = Object.freeze(this._enabledTestsMap); } - - updateConfig(globalConfig: Config.GlobalConfig): Config.GlobalConfig { - if (!this._enabledTestsMap) { - return globalConfig; - } - const newConfig: Config.GlobalConfig = {...globalConfig}; - newConfig.enabledTestsMap = this._enabledTestsMap; - return Object.freeze(newConfig); - } } diff --git a/packages/jest-core/src/__tests__/FailedTestsCache.test.js b/packages/jest-core/src/__tests__/FailedTestsCache.test.js index da58776da4bd..78bf35993bc7 100644 --- a/packages/jest-core/src/__tests__/FailedTestsCache.test.js +++ b/packages/jest-core/src/__tests__/FailedTestsCache.test.js @@ -59,11 +59,5 @@ describe('FailedTestsCache', () => { path: '/path/to/failed_2.js', }, ]); - expect(failedTestsCache.updateConfig({})).toMatchObject({ - enabledTestsMap: { - '/path/to/failed_1.js': {'test 3': true, 'test 4': true}, - '/path/to/failed_2.js': {'test 5': true}, - }, - }); }); }); diff --git a/packages/jest-core/src/__tests__/watch.test.js b/packages/jest-core/src/__tests__/watch.test.js index fbf6bead2573..12f487db52f6 100644 --- a/packages/jest-core/src/__tests__/watch.test.js +++ b/packages/jest-core/src/__tests__/watch.test.js @@ -613,7 +613,6 @@ describe('Watch mode flows', () => { ${'✖︎'} | ${'coverageThreshold'} ${'✖︎'} | ${'detectLeaks'} ${'✖︎'} | ${'detectOpenHandles'} - ${'✖︎'} | ${'enabledTestsMap'} ${'✖︎'} | ${'errorOnDeprecated'} ${'✖︎'} | ${'expand'} ${'✖︎'} | ${'filter'} diff --git a/packages/jest-core/src/runJest.ts b/packages/jest-core/src/runJest.ts index 9609b37d72d7..3ba926288e71 100644 --- a/packages/jest-core/src/runJest.ts +++ b/packages/jest-core/src/runJest.ts @@ -201,7 +201,6 @@ export default async function runJest({ if (globalConfig.onlyFailures) { if (failedTestsCache) { allTests = failedTestsCache.filterTests(allTests); - globalConfig = failedTestsCache.updateConfig(globalConfig); } else { allTests = sequencer.allFailedTests(allTests); } diff --git a/packages/jest-jasmine2/src/index.ts b/packages/jest-jasmine2/src/index.ts index 1056dcec7330..29d508cc6f6d 100644 --- a/packages/jest-jasmine2/src/index.ts +++ b/packages/jest-jasmine2/src/index.ts @@ -159,14 +159,7 @@ async function jasmine2( } } - if (globalConfig.enabledTestsMap) { - env.specFilter = (spec: Spec) => { - const suiteMap = - globalConfig.enabledTestsMap && - globalConfig.enabledTestsMap[spec.result.testPath]; - return (suiteMap && suiteMap[spec.result.fullName]) || false; - }; - } else if (globalConfig.testNamePattern) { + if (globalConfig.testNamePattern) { const testNameRegex = new RegExp(globalConfig.testNamePattern, 'i'); env.specFilter = (spec: Spec) => testNameRegex.test(spec.getFullName()); } diff --git a/packages/jest-types/src/Config.ts b/packages/jest-types/src/Config.ts index cf48b24c66d6..bc8c925777bd 100644 --- a/packages/jest-types/src/Config.ts +++ b/packages/jest-types/src/Config.ts @@ -268,11 +268,6 @@ export type GlobalConfig = { coverageThreshold?: CoverageThreshold; detectLeaks: boolean; detectOpenHandles: boolean; - enabledTestsMap?: { - [key: string]: { - [key: string]: boolean; - }; - }; expand: boolean; filter?: Path; findRelatedTests: boolean; diff --git a/packages/test-utils/src/config.ts b/packages/test-utils/src/config.ts index fbd6226809eb..f81132fa2215 100644 --- a/packages/test-utils/src/config.ts +++ b/packages/test-utils/src/config.ts @@ -20,7 +20,6 @@ const DEFAULT_GLOBAL_CONFIG: Config.GlobalConfig = { coverageThreshold: {global: {}}, detectLeaks: false, detectOpenHandles: false, - enabledTestsMap: undefined, errorOnDeprecated: false, expand: false, filter: undefined, From f86d9d14e324c5e7fa8cafa00dd7556e62c7808c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Thu, 5 Nov 2020 23:02:45 +0100 Subject: [PATCH 2/4] add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1deaa173c2f5..7a3e3c37d0ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - `[*]` [**BREAKING**] Only support Node LTS releases and Node 15 ([#10685](https://github.com/facebook/jest/pull/10685)) - `[*]` [**BREAKING**] Add `exports` field to all `package.json`s ([#9921](https://github.com/facebook/jest/pull/9921)) - `[jest-resolve]` [**BREAKING**] Migrate to ESM ([#10688](https://github.com/facebook/jest/pull/10688)) +- `[*]` [**BREAKING**] Remove `enabledTestsMap` config, use `filter` instead ([#10787](https://github.com/facebook/jest/pull/10787)) ### Performance From 510a27088c801224e22953255891e39e3d6e3570 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 6 Nov 2020 13:31:37 +0100 Subject: [PATCH 3/4] Update FailedTestsCache.ts --- packages/jest-core/src/FailedTestsCache.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/jest-core/src/FailedTestsCache.ts b/packages/jest-core/src/FailedTestsCache.ts index 5d2098a2cd12..777f29ba9ca1 100644 --- a/packages/jest-core/src/FailedTestsCache.ts +++ b/packages/jest-core/src/FailedTestsCache.ts @@ -6,7 +6,6 @@ */ import type {TestResult} from '@jest/test-result'; -import type {Config} from '@jest/types'; import type {Test} from 'jest-runner'; type TestMap = Record>; From 2bf73438671970fe69feda9720590dab857f4bca Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 6 Nov 2020 13:32:06 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a3e3c37d0ab..d8bfbfa97d82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,8 +18,8 @@ - `[*]` [**BREAKING**] Only support Node LTS releases and Node 15 ([#10685](https://github.com/facebook/jest/pull/10685)) - `[*]` [**BREAKING**] Add `exports` field to all `package.json`s ([#9921](https://github.com/facebook/jest/pull/9921)) +- `[jest-config]` [**BREAKING**] Remove `enabledTestsMap` config, use `filter` instead ([#10787](https://github.com/facebook/jest/pull/10787)) - `[jest-resolve]` [**BREAKING**] Migrate to ESM ([#10688](https://github.com/facebook/jest/pull/10688)) -- `[*]` [**BREAKING**] Remove `enabledTestsMap` config, use `filter` instead ([#10787](https://github.com/facebook/jest/pull/10787)) ### Performance