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

Update all Jest packages to 17.x #8327

Merged
merged 4 commits into from
Nov 20, 2016
Merged

Update all Jest packages to 17.x #8327

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28786a3
Update all Jest packages to 17.x, cache babel-jest transforms
Nov 17, 2016
c353452
Remove the caching
Nov 17, 2016
7cd29b8
Remove unnecessary package, fix fiber test runner
Nov 20, 2016
8694d3a
Regenerate yarn lockfile
Nov 20, 2016
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: 1 addition & 1 deletion grunt/tasks/jest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function run(done, coverage) {
grunt.log.writeln('running jest');

var args = [
path.join('node_modules', 'jest', 'bin', 'jest'),
path.join('node_modules', 'jest-cli', 'bin', 'jest'),
];
if (coverage) {
args.push('--coverage');
Expand Down
13 changes: 8 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"babel-cli": "^6.6.5",
"babel-core": "^6.0.0",
"babel-eslint": "^7.1.0",
"babel-jest": "17.0.2",
"babel-plugin-check-es2015-constants": "^6.5.0",
"babel-plugin-syntax-trailing-function-commas": "^6.5.0",
"babel-plugin-transform-class-properties": "^6.11.5",
Expand Down Expand Up @@ -61,10 +62,10 @@
"gulp-load-plugins": "^1.2.4",
"gulp-util": "^3.0.7",
"gzip-js": "~0.3.2",
"jest": "^15.1.1",
"jest-config": "^15.1.1",
"jest-jasmine2": "^15.1.1",
"jest-runtime": "^15.1.1",
"jest-cli": "17.0.2",
Copy link
Contributor

Choose a reason for hiding this comment

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

jest just exports jest-cli (https://github.com/facebook/jest/blob/master/packages/jest/src/jest.js) so only one of them would be enough here.

"jest-config": "^17.0.2",
"jest-jasmine2": "^17.0.2",
"jest-runtime": "^17.0.2",
"loose-envify": "^1.1.0",
"merge-stream": "^1.0.0",
"object-assign": "^4.1.0",
Expand Down Expand Up @@ -98,7 +99,9 @@
"/react/build/"
],
"rootDir": "",
"scriptPreprocessor": "scripts/jest/preprocessor.js",
"transform": {
".*": "scripts/jest/preprocessor.js"
},
"setupFiles": [
"scripts/jest/environment.js"
],
Expand Down
8 changes: 5 additions & 3 deletions scripts/fiber/record-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ const fs = require('fs');
const os = require('os');
const path = require('path');

const SearchSource = require('jest').SearchSource;
const TestRunner = require('jest').TestRunner;
const SearchSource = require('jest-cli').SearchSource;
const TestRunner = require('jest-cli').TestRunner;
const TestWatcher = require('jest-cli/build/TestWatcher');
Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is a PR open to remove the need to delve into internals. jestjs/jest#2138


const createHasteContext = require('jest-runtime').createHasteContext;
const readConfig = require('jest-config').readConfig;
Expand Down Expand Up @@ -95,7 +96,8 @@ function runJest() {
getTestSummary: () => 'You did it!'
}
);
return runner.runTests(data.paths);
const watcher = new TestWatcher({isWatchMode: false});
return runner.runTests(data.paths, watcher);
});
});
});
Expand Down