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

Fix yarn test on windows #6534

Merged
merged 6 commits into from
Jul 3, 2018
Merged

Fix yarn test on windows #6534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42067a2
Force jest-preset.json to have LF as EOF
hron Jun 24, 2018
9d4dce7
Use a separate directory for test environment
hron Jun 24, 2018
737bf8a
Add entry to changelog
hron Jun 24, 2018
8f8effc
Check the error message instead of relying on the snapshot
hron Jul 1, 2018
a363949
Merge branch 'master' into fix-yarn-test-on-windows
SimenB Jul 3, 2018
50f99a7
move changelog entry
SimenB Jul 3, 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 @@ -7,6 +7,7 @@
### Chore & Maintenance

- `[website]` Switch domain to https://jestjs.io ([#6549](https://github.com/facebook/jest/pull/6549))
- `[tests]` Improve stability of `yarn test` on Windows ([#6534](https://github.com/facebook/jest/pull/6534))

## 23.2.0

Expand Down
2 changes: 1 addition & 1 deletion e2e/__tests__/test_environment_async.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const os = require('os');
const runJest = require('../runJest');
const {cleanup} = require('../Utils');

const DIR = os.tmpdir() + '/jest';
const DIR = os.tmpdir() + '/jest-test-environment';

beforeEach(() => cleanup(DIR));
afterAll(() => cleanup(DIR));
Expand Down
2 changes: 1 addition & 1 deletion e2e/test-environment-async/TestEnvironment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const os = require('os');
const mkdirp = require('mkdirp');
const JSDOMEnvironment = require('jest-environment-jsdom');

const DIR = os.tmpdir() + '/jest';
const DIR = os.tmpdir() + '/jest-test-environment';

class TestEnvironment extends JSDOMEnvironment {
constructor(config) {
Expand Down
11 changes: 0 additions & 11 deletions packages/jest-config/src/__tests__/__snapshots__/normalize.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@ exports[`Upgrade help logs a warning when \`scriptPreprocessor\` and/or \`prepro
<yellow></>"
`;

exports[`preset throws when preset is invalid 1`] = `
"<red><bold><bold>● <bold>Validation Error</>:</>
<red></>
<red> Preset <bold>react-native</> is invalid:</>
<red> Unexpected token } in JSON at position 104</>
<red></>
<red> <bold>Configuration Documentation:</></>
<red> https://facebook.github.io/jest/docs/configuration.html</>
<red></>"
`;

exports[`preset throws when preset not found 1`] = `
"<red><bold><bold>● <bold>Validation Error</>:</>
<red></>
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-config/src/__tests__/normalize.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ describe('preset', () => {
},
{},
);
}).toThrowErrorMatchingSnapshot();
}).toThrowError(/Unexpected token }/);
});

test('works with "react-native"', () => {
Expand Down