Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: always resolve "jest-environment-jsdom" from jest-config #7476

Merged
merged 3 commits into from
Dec 25, 2018
Merged

fix: always resolve "jest-environment-jsdom" from jest-config #7476

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a161ea5
fix: always resolve "jest-environment-jsdom" from jest-config
aleclarson Dec 6, 2018
83cde16
Merge branch 'master' into patch-1
SimenB Dec 25, 2018
7ed9dc6
update snapshot
SimenB Dec 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
- `[jest-config]` Allow `bail` setting to be configured with a number allowing tests to abort after `n` of failures ([#7335](https://github.com/facebook/jest/pull/7335))
- `[jest-config]` Allow % based configuration of `--max-workers` ([#7494](https://github.com/facebook/jest/pull/7494))
- `[jest-runner]` Instantiate the test environment class with the current `testPath` ([#7442](https://github.com/facebook/jest/pull/7442))
- `[jest-config]` Always resolve jest-environment-jsdom from jest-config ([#7476](https://github.com/facebook/jest/pull/7476))

### Fixes

Expand Down
10 changes: 4 additions & 6 deletions packages/jest-config/src/normalize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,12 +416,10 @@ export default function normalize(options: InitialOptions, argv: Argv) {
options = setupPreset(options, options.preset);
}

if (options.testEnvironment) {
options.testEnvironment = getTestEnvironment({
rootDir: options.rootDir,
testEnvironment: options.testEnvironment,
});
}
options.testEnvironment = getTestEnvironment({
rootDir: options.rootDir,
testEnvironment: options.testEnvironment || 'jsdom',
});

if (!options.roots && options.testPathDirs) {
options.roots = options.testPathDirs;
Expand Down