From e68f747179cfd704da3d288b0b4f6bb5c11243ac Mon Sep 17 00:00:00 2001 From: febbweiss Date: Fri, 11 Sep 2015 08:50:10 +0000 Subject: [PATCH] Fix: coverage configuration --- karma.conf.js | 10 +++++++--- package.json | 1 - ...cation.service.js => autentication.service.spec.js} | 0 test/{home.controller.js => home.controller.spec.js} | 0 test/{login.controller.js => login.controller.spec.js} | 0 ...ister.controller.js => register.controller.spec.js} | 0 6 files changed, 7 insertions(+), 4 deletions(-) rename test/{autentication.service.js => autentication.service.spec.js} (100%) rename test/{home.controller.js => home.controller.spec.js} (100%) rename test/{login.controller.js => login.controller.spec.js} (100%) rename test/{register.controller.js => register.controller.spec.js} (100%) diff --git a/karma.conf.js b/karma.conf.js index f5d86d8..becc510 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -21,7 +21,7 @@ module.exports = function(config) { 'public/libs/angular-mocks/angular-mocks.js', 'public/js/**/*.js', 'public/**/*.controller.js', - 'test/**/*.controller.js' + 'test/**/*.spec.js' ], @@ -29,21 +29,25 @@ module.exports = function(config) { exclude: [ ], + plugins: ['karma-jasmine', 'karma-mocha', 'karma-chai', 'karma-phantomjs-launcher', 'karma-coverage'], // preprocess matching files before serving them to the browser // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor preprocessors: { + 'public/js/**/*.js': ['coverage'], + 'public/**/*.controller.js': ['coverage'], }, // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress', 'coverage', 'coveralls'], + reporters: ['progress', 'coverage'], coverageReporter: { type: 'lcov', // lcov or lcovonly are required for generating lcov.info files - dir: 'coverage/' + dir: 'coverage', + subdir: '.' // Output the results into ./coverage/ }, // web server port diff --git a/package.json b/package.json index e201cf1..86d320b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "karma": "^0.13.9", "karma-chai": "^0.1.0", "karma-coverage": "^0.5.2", - "karma-coveralls": "^1.1.2", "karma-jasmine": "^0.3.6", "karma-mocha": "^0.2.0", "karma-phantomjs-launcher": "^0.2.1", diff --git a/test/autentication.service.js b/test/autentication.service.spec.js similarity index 100% rename from test/autentication.service.js rename to test/autentication.service.spec.js diff --git a/test/home.controller.js b/test/home.controller.spec.js similarity index 100% rename from test/home.controller.js rename to test/home.controller.spec.js diff --git a/test/login.controller.js b/test/login.controller.spec.js similarity index 100% rename from test/login.controller.js rename to test/login.controller.spec.js diff --git a/test/register.controller.js b/test/register.controller.spec.js similarity index 100% rename from test/register.controller.js rename to test/register.controller.spec.js