diff --git a/.gitignore b/.gitignore index 6b4a1c6..ee1660b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ bower_components/ .idea/ .tmp/ dist/ +coverage/ .editorconfig script-staging.sh diff --git a/karma.conf.js b/karma.conf.js index ccdef8a..1f8bdcf 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -13,12 +13,12 @@ function listFiles() { }); return wiredep(wiredepOptions).js - .concat([ - path.join(conf.paths.src, '/app/**/*.module.js'), - path.join(conf.paths.src, '/app/**/*.js'), - path.join(conf.paths.src, '/**/*.spec.js'), - path.join(conf.paths.src, '/**/*.mock.js'), - path.join(conf.paths.src, '/**/*.html') + .concat([ + path.join(conf.paths.src, '/app/**/*.module.js'), + path.join(conf.paths.src, '/app/**/*.js'), + path.join(conf.paths.src, '/**/*.spec.js'), + path.join(conf.paths.src, '/**/*.mock.js'), + path.join(conf.paths.src, '/**/*.html') ]); } @@ -45,14 +45,26 @@ module.exports = function(config) { browsers : ['PhantomJS'], plugins : [ - 'karma-phantomjs-launcher', - 'karma-angular-filesort', - 'karma-jasmine', - 'karma-ng-html2js-preprocessor' + 'karma-jasmine', + 'karma-coverage', + 'karma-angular-filesort', + 'karma-ng-html2js-preprocessor', + 'karma-phantomjs-launcher', + 'karma-chrome-launcher', + 'karma-firefox-launcher' ], preprocessors: { - 'src/**/*.html': ['ng-html2js'] + 'src/**/*.html': ['ng-html2js'], + 'src/app/**/*.js': ['coverage'] + }, + + reporters: ['progress', 'coverage'], + + coverageReporter: { + type : 'lcov', // HTML + LCOV + // type : 'cobertura', // supported by jenkins + dir : 'coverage/' } }; diff --git a/package.json b/package.json index e99fd0d..9f98164 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,9 @@ "jshint-stylish": "~2.0.0", "karma": "~0.12.36", "karma-angular-filesort": "~0.1.0", + "karma-chrome-launcher": "^0.2.1", + "karma-coverage": "^0.5.3", + "karma-firefox-launcher": "^0.1.7", "karma-jasmine": "~0.3.5", "karma-ng-html2js-preprocessor": "~0.1.2", "karma-phantomjs-launcher": "~0.2.0", -- libgit2 0.21.2