From a4a8cd05d298b0f67ca93f2f9f0c7f8f10b1082a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 16:59:19 +0200 Subject: [PATCH] Updated to nodejs packages and karma code coverage setup --- package.json | 21 +++++++++------------ tasks/options/karma.js | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 8785632eaee..5016a6309eb 100644 --- a/package.json +++ b/package.json @@ -34,22 +34,19 @@ "grunt-string-replace": "~0.2.4", "grunt-usemin": "3.0.0", "jshint-stylish": "~0.1.5", - "karma": "~0.12.21", + "karma": "~0.12.31", "karma-chrome-launcher": "~0.1.4", "karma-coffee-preprocessor": "~0.1.2", - "karma-coverage": "^0.2.5", - "karma-coveralls": "^0.1.4", + "karma-coverage": "0.3.1", + "karma-coveralls": "0.1.5", "karma-expect": "~1.1.0", - "karma-firefox-launcher": "~0.1.3", - "karma-html2js-preprocessor": "~0.1.0", - "karma-jasmine": "~0.2.2", "karma-mocha": "~0.1.4", - "karma-phantomjs-launcher": "~0.1.4", - "karma-requirejs": "~0.2.1", - "karma-script-launcher": "~0.1.0", - "load-grunt-tasks": "~0.2.0", - "mocha": "~1.16.1", - "requirejs": "~2.1.14", + "karma-phantomjs-launcher": "0.1.4", + "karma-requirejs": "0.2.2", + "karma-script-launcher": "0.1.0", + "load-grunt-tasks": "0.2.0", + "mocha": "2.2.4", + "requirejs": "2.1.17", "rjs-build-analysis": "0.0.3" }, "engines": { diff --git a/tasks/options/karma.js b/tasks/options/karma.js index 630dc19878e..44f11d62a23 100644 --- a/tasks/options/karma.js +++ b/tasks/options/karma.js @@ -16,7 +16,7 @@ module.exports = function(config) { configFile: '<%= srcDir %>/test/karma.conf.js', reporters: ['dots','coverage','coveralls'], preprocessors: { - '<%= srcDir %>/app/**/*.js': ['coverage'] + 'public/app/**/*.js': ['coverage'] }, coverageReporter: { type: 'lcov',