diff --git a/lib/coverage-merge.js b/lib/coverage-merge.js index ba5127a8..47b63556 100644 --- a/lib/coverage-merge.js +++ b/lib/coverage-merge.js @@ -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); diff --git a/test/integration/coverage-test.js b/test/integration/coverage-test.js index 4749da81..72cb7a4f 100644 --- a/test/integration/coverage-test.js +++ b/test/integration/coverage-test.js @@ -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); + }); + }); }); diff --git a/tests/dummy/config/coverage-nested-folder.js b/tests/dummy/config/coverage-nested-folder.js new file mode 100644 index 00000000..ae5fac98 --- /dev/null +++ b/tests/dummy/config/coverage-nested-folder.js @@ -0,0 +1,7 @@ +/*jshint node:true*/ +'use strict'; + +module.exports = { + coverageFolder: 'coverage/abc/easy-as/123', + parallel: true +};