Skip to content

Commit e68e175

Browse files
committed
Remove coverage options from package.json
They don't provide any value and since one of them isn't a valid config usage, it blurs the line. Instead just store these pieces in the tasks and write them to the temp config.
1 parent f3dbc40 commit e68e175

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

grunt/tasks/jest.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,22 @@ var tempConfigPath = path.join(buildPath, 'jest-config.json');
1919

2020
var config = require(path.join(rootPath, 'package.json')).jest;
2121

22+
var collectCoverageOnlyFrom = {
23+
'src/**/*.js': {
24+
ignore: [
25+
'src/**/__tests__/*.js',
26+
'src/shared/vendor/third_party/*.js',
27+
'src/test/*.js',
28+
],
29+
},
30+
};
31+
2232
function getCollectCoverageOnlyFrom(callback) {
23-
var coverageFrom = config.collectCoverageOnlyFrom;
24-
var patterns = Object.keys((config.collectCoverage && coverageFrom) || {});
33+
var patterns = Object.keys(collectCoverageOnlyFrom);
2534
var result = {};
2635

2736
async.each(patterns, function(pattern) {
28-
var options = assign({ nodir: true }, coverageFrom[pattern]);
37+
var options = assign({ nodir: true }, collectCoverageOnlyFrom[pattern]);
2938
glob(pattern, options, function(err, files) {
3039
(files || []).reduce(function(object, key) {
3140
object[key] = true;
@@ -44,6 +53,7 @@ function getJestConfig(callback) {
4453
getCollectCoverageOnlyFrom(function(err, data) {
4554
callback(err, assign({}, config, {
4655
rootDir: rootDir,
56+
collectCoverage: true,
4757
collectCoverageOnlyFrom: data,
4858
}));
4959
});

package.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@
5757
"test": "jest"
5858
},
5959
"jest": {
60-
"collectCoverage": true,
61-
"collectCoverageOnlyFrom": {
62-
"src/**/*.js": {
63-
"ignore": [
64-
"src/**/__tests__/*.js",
65-
"src/shared/vendor/third_party/*.js",
66-
"src/test/*.js"
67-
]
68-
}
69-
},
7060
"modulePathIgnorePatterns": [
7161
"/.module-cache/",
7262
"/react/build/"

0 commit comments

Comments
 (0)