Skip to content

Commit

Permalink
PR #118 - Merge branch 'shifter-coverage-file-fix' of https://github.…
Browse files Browse the repository at this point in the history
  • Loading branch information
caridy committed Apr 15, 2014
2 parents 1227ffe + 84f5823 commit 66334d6
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 31 deletions.
9 changes: 4 additions & 5 deletions lib/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -385,16 +385,15 @@ var buildCoverage = function (mod, name, callback) {
logger: log,
registry: registry
}),
fileName = mod.basefilename || name;
fileName = mod.basefilename || name,
filePath = path.join(mod.buildDir, fileName, fileName + '.js');

queue.read([
path.join(mod.buildDir, fileName, fileName + '.js')
])
queue.read([filePath])
.log('coverage file read, starting coverage for: ' + fileName + '/' + fileName + '.js')
.coverage({
type: coverageType,
charset: 'utf8',
name: 'build/' + fileName + '/' + fileName + '.js'
name: path.relative(shifter.cwd(), filePath)
})
.replace(replaceOptions)
.check()
Expand Down
4 changes: 2 additions & 2 deletions tests/5-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var tests = {
}(file));
});
}));

fs.readdir(path.join(buildXBase, 'yql'), stack.add(function(err, files) {
files.forEach(function(file) {
(function(file) {
Expand All @@ -84,7 +84,7 @@ var tests = {
}(file));
});
}));

stack.done(function() {
self.callback(null, results);
});
Expand Down
8 changes: 4 additions & 4 deletions tests/assets/freestyle/build-expected/foo/foo-coverage.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions tests/assets/yql/build-expected/yql/yql-coverage.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/assets/yql/build-uglify/calendar/calendar-coverage.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/assets/yql/build-uglify/uploader/uploader-coverage.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 66334d6

Please sign in to comment.