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

Jump to bottom

Resolves the test sequencer even when not explicitly set #8267

Merged
merged 7 commits into from
Apr 3, 2019
Merged

Resolves the test sequencer even when not explicitly set #8267

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4676d43
Fixes the test-sequencer resolution w/ pnp
Apr 3, 2019
266d2c4
Update CHANGELOG.md
arcanis Apr 3, 2019
3765d99
Update normalize.ts
arcanis Apr 3, 2019
4f3ddcc
Merge branch 'master' into resolve-test-sequencer
arcanis Apr 3, 2019
40e7f1e
Update normalize.ts
arcanis Apr 3, 2019
5e580e3
Fixes snapshot
Apr 3, 2019
2800f8b
Fix testSequencer value being overwritten by 'old style' of options.
scotthovestadt Apr 3, 2019
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Fixes

- `[@jest/config]` Normalize `testSequencer` to its absolute path ([#8267](https://github.com/facebook/jest/pull/8267))

### Chore & Maintenance

### Performance
Expand Down
4 changes: 4 additions & 0 deletions packages/jest-config/src/normalize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,10 @@ export default function normalize(
options.testRunner = require.resolve('jest-jasmine2');
}

if (!options.testSequencer) {
Copy link
Member

@SimenB SimenB Apr 3, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch. Do we need the if at all? Or can we do what we do on line 463?

  options.testEnvironment = getTestEnvironment({
    rootDir: options.rootDir,
    testEnvironment: options.testEnvironment || DEFAULT_CONFIG.testEnvironment,
  });

So (ish)

  options.testSequencer = getTestSequencer({
    rootDir: options.rootDir,
    testSequencer: options.testSequencer || DEFAULT_CONFIG.testSequencer,
  });

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if so, also remove https://github.com/facebook/jest/blob/c85a5e9b1a8a82d837418d79bdb98493b4df460b/packages/jest-config/src/normalize.ts#L592-L602

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(might be a slippery slope, and should rather be part of a larger refactor of normalize)

options.testSequencer = require.resolve('@jest/test-sequencer');
}

if (!options.coverageDirectory) {
options.coverageDirectory = path.resolve(options.rootDir, 'coverage');
}
Expand Down