From 5b0c01622836757ed511c6ad6ddbd133e39463bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Wed, 15 Aug 2018 21:59:09 +0200 Subject: [PATCH 1/2] Fix incorrect testEnvironmentOptions warning --- CHANGELOG.md | 4 ++++ packages/jest-config/src/normalize.js | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5feee595060a..6aae9b120942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## master +### Fixes + +- `[jest-cli]` Fix incorrect `testEnvironmentOptions` warning ([#6844](https://github.com/facebook/jest/pull/6844)) + ### Chore & Maintenance - `[docs]` Add custom toMatchSnapshot matcher docs ([#6837](https://github.com/facebook/jest/pull/6837)) diff --git a/packages/jest-config/src/normalize.js b/packages/jest-config/src/normalize.js index 665899f118ce..eebe542525da 100644 --- a/packages/jest-config/src/normalize.js +++ b/packages/jest-config/src/normalize.js @@ -342,6 +342,7 @@ export default function normalize(options: InitialOptions, argv: Argv) { 'coverageThreshold', 'globals', 'moduleNameMapper', + 'testEnvironmentOptions', 'transform', ], }); From cc5d608a3df557858266e5f8a7521319b2b6aefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Wed, 15 Aug 2018 22:01:44 +0200 Subject: [PATCH 2/2] fix pr no --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aae9b120942..445cc2d9e378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### Fixes -- `[jest-cli]` Fix incorrect `testEnvironmentOptions` warning ([#6844](https://github.com/facebook/jest/pull/6844)) +- `[jest-cli]` Fix incorrect `testEnvironmentOptions` warning ([#6852](https://github.com/facebook/jest/pull/6852)) ### Chore & Maintenance