Commit 39f32f98 by Usman Khalid

Simplified normalizePathsForCoverage.

parent 2839a42e
...@@ -124,24 +124,24 @@ function junitSettings(config) { ...@@ -124,24 +124,24 @@ function junitSettings(config) {
}; };
} }
var normalizePathsForCoverage = function(files, normalize_func) { var defaultNormalizeFunc = function (appRoot, pattern) {
var filesForCoverage = {}; if (pattern.match(/^common\/js/)) {
pattern = path.join(appRoot, '/common/static/' + pattern);
} else if (pattern.match(/^xmodule_js\/common_static/)) {
pattern = path.join(appRoot, '/common/static/' +
pattern.replace(/^xmodule_js\/common_static\//, ''));
}
return pattern;
};
var normalizePathsForCoverage = function(files, normalizeFunc) {
var normalizeFn = normalizeFunc || defaultNormalizeFunc,
filesForCoverage = {};
files.forEach(function (file) { files.forEach(function (file) {
if (_.isObject(file) && file.ignoreCoverage) { return; } if (!file.ignoreCoverage) {
filesForCoverage[normalizeFn(appRoot, file.pattern)] = ['coverage'];
var pattern = _.isObject(file) ? file.pattern : file;
if (normalize_func) {
pattern = normalize_func(appRoot, pattern);
} else {
if (pattern.match(/^common\/js/)) {
pattern = path.join(appRoot, '/common/static/' + pattern);
} else if (pattern.match(/^xmodule_js\/common_static/)) {
pattern = path.join(appRoot, '/common/static/' +
pattern.replace(/^xmodule_js\/common_static\//, ''));
}
} }
filesForCoverage[pattern] = ['coverage'];
}); });
return filesForCoverage; return filesForCoverage;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment