diff --git a/.travis.yml b/.travis.yml index 8aa6ef8ebd..42838b04cf 100755 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_script: - ng build --prod script: - - ng test --watch=false + - ng test --single-run --code-coverage --reporters=coverage-istanbul - ng lint after_success: diff --git a/karma.conf.js b/karma.conf.js index 99fdf3cd90..ba0784e6f1 100755 --- a/karma.conf.js +++ b/karma.conf.js @@ -8,7 +8,8 @@ module.exports = function (config) { plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), - require('karma-remap-istanbul'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), require('@angular/cli/plugins/karma'), require('karma-coverage') ], @@ -20,26 +21,22 @@ module.exports = function (config) { './src/test.ts': ['@angular/cli'], 'src/app/**/*.js': ['coverage'] }, + client: { + clearContext: false + }, mime: { 'text/x-typescript': ['ts', 'tsx'] }, - remapIstanbulReporter: { - reports: { - html: 'coverage', - lcovonly: './coverage/coverage.lcov' - } - }, - coverageReporter: { - type: 'lcov', - dir: 'coverage/' + coverageIstanbulReporter: { + reports: [ 'html', 'lcovonly' ], + fixWebpackSourcePaths: true }, angularCli: { - config: './angular-cli.json', environment: 'dev' }, reporters: config.angularCli && config.angularCli.codeCoverage - ? ['progress', 'karma-remap-istanbul'] - : ['progress', 'coverage'], + ? ['progress', 'coverage-istanbul'] + : ['progress', 'kjhtml'], port: 9876, colors: true, logLevel: config.LOG_INFO, diff --git a/package.json b/package.json index 78976b1ce9..14fa774355 100755 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "node server.js", "lint": "tslint \"src/**/*.ts\"", - "test": "ng test", + "test": "ng test --single-run --code-coverage --reporters=coverage-istanbul", "pree2e": "webdriver-manager update", "e2e": "protractor", "postinstall": "ng build --prod --aot", @@ -57,7 +57,9 @@ "karma-chrome-launcher": "^2.1.1", "karma-cli": "^1.0.1", "karma-coverage": "^1.1.1", + "karma-coverage-istanbul-reporter": "^1.3.0", "karma-jasmine": "^1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", "karma-remap-istanbul": "^0.6.0", "protractor": "5.1.2", "ts-node": "3.0.4",