Skip to content

Commit 66334d6

Browse files
committed
PR #118 - Merge branch 'shifter-coverage-file-fix' of https://github.com/leik/shifter
2 parents 1227ffe + 84f5823 commit 66334d6

File tree

8 files changed

+30
-31
lines changed

8 files changed

+30
-31
lines changed

lib/module.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -385,16 +385,15 @@ var buildCoverage = function (mod, name, callback) {
385385
logger: log,
386386
registry: registry
387387
}),
388-
fileName = mod.basefilename || name;
388+
fileName = mod.basefilename || name,
389+
filePath = path.join(mod.buildDir, fileName, fileName + '.js');
389390

390-
queue.read([
391-
path.join(mod.buildDir, fileName, fileName + '.js')
392-
])
391+
queue.read([filePath])
393392
.log('coverage file read, starting coverage for: ' + fileName + '/' + fileName + '.js')
394393
.coverage({
395394
type: coverageType,
396395
charset: 'utf8',
397-
name: 'build/' + fileName + '/' + fileName + '.js'
396+
name: path.relative(shifter.cwd(), filePath)
398397
})
399398
.replace(replaceOptions)
400399
.check()

tests/5-builder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var tests = {
7171
}(file));
7272
});
7373
}));
74-
74+
7575
fs.readdir(path.join(buildXBase, 'yql'), stack.add(function(err, files) {
7676
files.forEach(function(file) {
7777
(function(file) {
@@ -84,7 +84,7 @@ var tests = {
8484
}(file));
8585
});
8686
}));
87-
87+
8888
stack.done(function() {
8989
self.callback(null, results);
9090
});

tests/assets/freestyle/build-expected/foo/foo-coverage.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/assets/yql/build-expected/yql/yql-coverage.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/assets/yql/build-uglify/calendar/calendar-coverage.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/assets/yql/build-uglify/event-base-ie/event-base-ie-coverage.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/assets/yql/build-uglify/uploader/uploader-coverage.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)