diff --git a/karma.conf.js b/karma.conf.js index 2d7216a..152285d 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -10,7 +10,7 @@ module.exports = function (config) { plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), - require('karma-remap-istanbul'), + require('karma-coverage-istanbul-reporter'), require('@angular/cli/plugins/karma') ], files: [ @@ -19,18 +19,16 @@ module.exports = function (config) { preprocessors: { './scripts/test.ts': ['@angular/cli'] }, - remapIstanbulReporter: { - reports: { - html: 'coverage', - lcovonly: './coverage/coverage.lcov' - } + coverageIstanbulReporter: { + reports: [ 'html', 'lcovonly' ], + fixWebpackSourcePaths: false }, angularCli: { config: './angular-cli.json', environment: 'dev' }, reporters: config.angularCli && config.angularCli.codeCoverage - ? ['dots', 'karma-remap-istanbul'] + ? ['dots', 'coverage-istanbul'] : ['dots'], port: 9876, colors: true, diff --git a/package.json b/package.json index 30f6f7e..f8dbcb1 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "@angular/core": "^2.3.1 || >=4.0.0" }, "devDependencies": { + "@angular/cli": "1.0.0", "@angular/common": "2.4.3", "@angular/compiler": "2.4.3", "@angular/compiler-cli": "2.4.3", @@ -64,7 +65,6 @@ "@types/marked": "0.0.28", "@types/node": "7.0.0", "@types/webpack": "^2.2.1", - "@angular/cli": "1.0.0", "bootstrap": "3.3.7", "chokidar-cli": "1.2.0", "classlist-polyfill": "1.0.3", @@ -87,6 +87,7 @@ "karma": "1.4.0", "karma-chrome-launcher": "^2.0.0", "karma-cli": "^1.0.1", + "karma-coverage-istanbul-reporter": "^1.3.0", "karma-jasmine": "^1.0.2", "karma-remap-istanbul": "0.4.0", "karma-sauce-launcher": "1.1.0", @@ -94,9 +95,9 @@ "lodash": "4.17.4", "markdown-loader": "^0.1.7", "marked": "0.3.6", - "ngx-bootstrap": "1.6.6", "ng2-page-scroll": "4.0.0-beta.2", "ngm-cli": "0.4.0", + "ngx-bootstrap": "1.6.6", "npm-run-all": "^4.0.1", "pre-commit": "1.2.2", "protractor": "5.0.0",