Skip to content

fix: handle babel 7 absolute paths #199

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

Merged
RobbieTheWagner merged 1 commit into from
Sep 25, 2018
Merged

fix: handle babel 7 absolute paths #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions lib/attach-middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@ function fixFilePaths(coverageData, fileLookup) {
return coverageData;
}

function writeCoverage(coverage, fileLookup, map) {
function writeCoverage(coverage, fileLookup, root, map) {
// Convert absolute paths (path to process.cwd + module path) to relative (module) paths, when necessary (babel >6)
// eg. /Users/user/apps/my-ember-app/my-ember-app/app.js => my-ember-app/app.js
const fixedCoverage = Object.keys(coverage).reduce((memo, filePath) => {
const modulePath = path.relative(root, filePath);
memo[modulePath] = Object.assign({}, coverage[filePath], { path: modulePath });
return memo;
}, {});
Object.keys(fileLookup).forEach(filename => {
let fileCoverage = coverage[filename] || istanbul.libCoverage.createFileCoverage(filename).data;
let fileCoverage = fixedCoverage[filename] || istanbul.libCoverage.createFileCoverage(filename).data;
map.addFileCoverage(fixFilePaths(fileCoverage, fileLookup));
});
}
Expand All @@ -45,7 +52,7 @@ function reportCoverage(map, root, configPath) {
}

function coverageHandler(map, options, req, res) {
writeCoverage(req.body, options.fileLookup, map);
writeCoverage(req.body, options.fileLookup, options.root, map);
reportCoverage(map, options.root, options.configPath);
res.send(map.getCoverageSummary());
}
Expand Down
1 change: 1 addition & 0 deletions test/integration/app-coverage-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('app coverage generation', function() {
}).then(() => {
app.editPackageJSON(pkg => {
pkg.devDependencies['ember-exam'] = '1.0.0';
pkg.devDependencies['ember-cli-babel'] = '^7.1.0';
// Temporarily remove the addon before install to work around https://github.com/tomdale/ember-cli-addon-tests/issues/176
delete pkg.devDependencies['ember-cli-code-coverage'];
});
Expand Down