From 276e40e4bb042a50c7a591baa8fe68bd663c4625 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Tue, 11 Dec 2018 17:17:08 +0000 Subject: [PATCH] [ADF-3790] Fix core coverage (#4011) * Fix core coverage * Fix karma path --- angular.json | 2 +- lib/core/karma.conf.js | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/angular.json b/angular.json index 9e3eeae497..61a58eb12f 100644 --- a/angular.json +++ b/angular.json @@ -533,7 +533,7 @@ }, "core": { "root": "lib/core", - "sourceRoot": "lib/core/src", + "sourceRoot": "lib/core", "projectType": "library", "prefix": "adf", "architect": { diff --git a/lib/core/karma.conf.js b/lib/core/karma.conf.js index f8de055666..e3ddee39a6 100644 --- a/lib/core/karma.conf.js +++ b/lib/core/karma.conf.js @@ -27,10 +27,8 @@ module.exports = function (config) { {pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false}, {pattern: 'lib/core/i18n/**/en.json', included: false, served: true, watched: false}, - {pattern: 'lib/core/**/*.ts', included: false, served: true, watched: false}, {pattern: 'lib/core/assets/**/*.svg', included: false, served: true, watched: false}, - {pattern: 'lib/config/app.config.json', included: false, served: true, watched: false}, {pattern: 'lib/core/viewer/assets/fake-test-file.pdf', included: false, served: true, watched: false}, {pattern: 'lib/core/viewer/assets/fake-test-file.txt', included: false, served: true, watched: false}, @@ -71,18 +69,11 @@ module.exports = function (config) { clearContext: false // leave Jasmine Spec Runner output visible in browser }, coverageIstanbulReporter: { - dir: './lib/coverage/core/', + dir: require('path').join(__dirname, '../coverage/core'), reports: ['html', 'lcovonly'], fixWebpackSourcePaths: true }, - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - colors: true, - - autoWatch: false, - browserDisconnectTimeout: 200000, browserNoActivityTimeout: 2400000, captureTimeout: 1200000, @@ -101,6 +92,9 @@ module.exports = function (config) { reporters: ['mocha', 'kjhtml'], port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, browsers: ['Chrome'], singleRun: false });