Skip to content

Nested folder for ember coverage-merge #93

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 2 commits into from
Sep 29, 2017
Merged

Nested folder for ember coverage-merge #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f025d5f
support nested coverageFolder
designblooz Jan 12, 2017
3a702aa
fix test
designblooz Sep 27, 2017
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
10 changes: 6 additions & 4 deletions lib/coverage-merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ module.exports = {
run: function () {
var collector = new Istanbul.Collector();
var _config = this._getConfig();
var projectRoot = this.project.root;
var reporter = new Istanbul.Reporter(null, path.join(projectRoot, _config.coverageFolder));
var coverageDirRegex = new RegExp(_config.coverageFolder + '_.*');
var coverageFolderSplit = _config.coverageFolder.split('/');
var coverageFolder = coverageFolderSplit.pop();
var coverageRoot = this.project.root + '/' + coverageFolderSplit.join('/');
var coverageDirRegex = new RegExp(coverageFolder + '_.*');
var reporter = new Istanbul.Reporter(null, path.join(coverageRoot, coverageFolder));

return new Promise(function (resolve, reject) {
dir.readFiles(projectRoot, {matchDir: coverageDirRegex, match: /coverage-final\.json/},
dir.readFiles(coverageRoot, {matchDir: coverageDirRegex, match: /coverage-final\.json/},
function (err, coverageSummary, next) {
if (err) {
reject(err);
Expand Down
21 changes: 21 additions & 0 deletions test/integration/coverage-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,25 @@ export default Ember.Route.extend({
expect(summary['tests/dummy/app/templates/application.hbs'].lines.pct).to.equal(100);
});
});

it('uses nested coverageFolder and parallel configuration and run merge-coverage', function() {
this.timeout(100000);
var coverageFolder = 'coverage/abc/easy-as/123';

expect(dir(coverageFolder)).to.not.exist;
fs.copySync('tests/dummy/config/coverage-nested-folder.js', 'tests/dummy/config/coverage.js');
return runCommand('ember', ['exam', '--split=2', '--parallel=true'], {env: {COVERAGE: true}}).then(function() {
expect(dir(coverageFolder)).to.not.exist;
return runCommand('ember', ['coverage-merge']);
}).then(function() {
expect(file(coverageFolder + '/lcov-report/index.html')).to.not.be.empty;
expect(file(coverageFolder + '/index.html')).to.not.be.empty;
var summary = fs.readJSONSync(coverageFolder + '/coverage-summary.json');
expect(summary.total.lines.pct).to.equal(100);
expect(summary['tests/dummy/app/resolver.js'].lines.pct).to.equal(100);
expect(summary['tests/dummy/app/app.js'].lines.pct).to.equal(100);
expect(summary['tests/dummy/app/router.js'].lines.pct).to.equal(100);
expect(summary['tests/dummy/app/templates/application.hbs'].lines.pct).to.equal(100);
});
});
});
7 changes: 7 additions & 0 deletions tests/dummy/config/coverage-nested-folder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*jshint node:true*/
'use strict';

module.exports = {
coverageFolder: 'coverage/abc/easy-as/123',
parallel: true
};