From c42004ee3c34833bde01df7bcaa26f6fd8ee6f8a Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 17 Jul 2017 13:13:11 -0500 Subject: [PATCH] fixed coverege error --- karma.conf.js | 35 +++++++++++++++-------------------- package.json | 2 ++ webpack/webpack.test.js | 22 ++++++++++------------ yarn.lock | 18 ++++++++---------- 4 files changed, 35 insertions(+), 42 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 24c9f34fc6..8f51e61344 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -27,16 +27,18 @@ module.exports = function (config) { frameworks: ['jasmine'], plugins: [ + require('karma-webpack'), require('karma-jasmine'), require('karma-chrome-launcher'), require('karma-phantomjs-launcher'), require('karma-webdriver-launcher'), require('karma-coverage'), + require('karma-remap-coverage'), require('karma-mocha-reporter'), require('karma-remap-istanbul'), require('karma-sourcemap-loader'), - require('karma-webpack'), - require("istanbul-instrumenter-loader") + require("istanbul-instrumenter-loader"), + require("karma-istanbul-preprocessor") ], // list of files to exclude @@ -57,34 +59,29 @@ module.exports = function (config) { * available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor */ preprocessors: { - './spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] + './spec-bundle.js': ['istanbul', 'webpack', 'sourcemap'] }, // Webpack Config at ./webpack.test.js webpack: testWebpackConfig, + // save interim raw coverage report in memory coverageReporter: { - reporters: [{ - type: 'in-memory' - }, { - type: 'json', - subdir: '.', - file: 'coverage-final.json' - }, { - type: 'html', - dir: 'coverage/' - }] + type: 'in-memory' }, remapCoverageReporter: { - 'text-summary': null, - json: './coverage/coverage.json', - html: './coverage/html' + 'text-summary': null, // to show summary in console + html: './coverage/html', + cobertura: './coverage/cobertura.xml' }, remapIstanbulReporter: { + remapOptions: {}, //additional remap options reports: { - html: 'coverage' + json: 'coverage/coverage.json', + lcovonly: 'coverage/lcov.info', + html: 'coverage/html/', } }, @@ -114,9 +111,7 @@ module.exports = function (config) { * possible values: 'dots', 'progress' * available reporters: https://npmjs.org/browse/keyword/karma-reporter */ - reporters: [ - 'mocha', 'coverage', 'karma-remap-istanbul' - ], + reporters: ['mocha', 'coverage', 'remap-coverage', 'karma-remap-istanbul'], // Karma web server port port: 9876, diff --git a/package.json b/package.json index c005efd814..b7fe38a0ff 100644 --- a/package.json +++ b/package.json @@ -149,9 +149,11 @@ "karma-chrome-launcher": "2.2.0", "karma-cli": "1.0.1", "karma-coverage": "1.1.1", + "karma-istanbul-preprocessor": "0.0.2", "karma-jasmine": "1.1.0", "karma-mocha-reporter": "2.2.3", "karma-phantomjs-launcher": "1.0.4", + "karma-remap-coverage": "0.1.4", "karma-remap-istanbul": "0.6.0", "karma-sourcemap-loader": "0.3.7", "karma-webdriver-launcher": "1.0.5", diff --git a/webpack/webpack.test.js b/webpack/webpack.test.js index a12b0f8946..2948473370 100644 --- a/webpack/webpack.test.js +++ b/webpack/webpack.test.js @@ -1,5 +1,3 @@ -const path = require('path'); - const { root } = require('./helpers'); @@ -31,7 +29,7 @@ module.exports = function (options) { * Do not change, leave as is or it wont work. * See: https://github.com/webpack/karma-webpack#source-maps */ - devtool: 'inline-source-map', + devtool: 'source-map', /** * Options affecting the resolving of modules. @@ -50,7 +48,7 @@ module.exports = function (options) { /** * Make sure root is src */ - modules: [path.resolve(__dirname, 'src'), 'node_modules'] + modules: [root('src'), 'node_modules'] }, @@ -112,19 +110,19 @@ module.exports = function (options) { use: [{ loader: 'to-string-loader', options: { - sourceMap: 'inline' + sourceMap: true } }, { loader: 'css-loader', options: { - sourceMap: 'inline' + sourceMap: true } }, { loader: 'postcss-loader', options: { - sourceMap: 'inline' + sourceMap: true } } ], @@ -141,30 +139,30 @@ module.exports = function (options) { use: [{ loader: 'to-string-loader', options: { - sourceMap: 'inline' + sourceMap: true } }, { loader: 'raw-loader', options: { - sourceMap: 'inline' + sourceMap: true } }, { loader: 'postcss-loader', options: { - sourceMap: 'inline' + sourceMap: true } }, { loader: 'resolve-url-loader', options: { - sourceMap: 'inline' + sourceMap: true } }, { loader: 'sass-loader', options: { - sourceMap: 'inline' + sourceMap: true } } ], diff --git a/yarn.lock b/yarn.lock index d06b7e4a27..61237cce94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3558,6 +3558,12 @@ karma-coverage@1.1.1: minimatch "^3.0.0" source-map "^0.5.1" +karma-istanbul-preprocessor@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/karma-istanbul-preprocessor/-/karma-istanbul-preprocessor-0.0.2.tgz#6965116c3b4c0b9d4ff62cb8b924349372be1eff" + dependencies: + istanbul "^0.4.3" + karma-jasmine@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" @@ -5435,7 +5441,7 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" -postcss@6.0.7: +postcss@6.0.7, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6: version "6.0.7" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.7.tgz#6a097477c46d13d0560a817d69abc0bae549d0a0" dependencies: @@ -5452,14 +5458,6 @@ postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0. source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd" - dependencies: - chalk "^2.0.1" - source-map "^0.5.6" - supports-color "^4.1.0" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -6746,7 +6744,7 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^4.0.0, supports-color@^4.1.0, supports-color@^4.2.0: +supports-color@^4.0.0, supports-color@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037" dependencies: