summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Wagner <bwagner@riseup.net>2016-06-26 08:19:38 +0200
committerBruno Wagner <bwagner@riseup.net>2016-06-26 08:19:38 +0200
commitee96141af8045d57bfc0a7560ee10ca90d7cd3d8 (patch)
tree93bb45bc08990fd74e94fef5c1a680e3fb8748a6
parent47544aa067fb0119147e0e302a7f08e215f0e88f (diff)
Updated karma and requirejs
Also changed reporter to dots, to decrease verbosity a little bit
-rw-r--r--web-ui/karma.conf.js2
-rw-r--r--web-ui/package.json10
2 files changed, 6 insertions, 6 deletions
diff --git a/web-ui/karma.conf.js b/web-ui/karma.conf.js
index e31262ff..152da31b 100644
--- a/web-ui/karma.conf.js
+++ b/web-ui/karma.conf.js
@@ -59,7 +59,7 @@ module.exports = function (config) {
// test results reporter to use
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
- reporters: ['progress', 'junit', 'coverage'],
+ reporters: ['dots', 'junit', 'coverage'],
preprocessors: {
'app/js/!(lib)/**/*.js': ['coverage']
diff --git a/web-ui/package.json b/web-ui/package.json
index b13459af..331b51f8 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -16,14 +16,14 @@
"karma-jasmine": "0.2.2",
"karma-junit-reporter": "0.2.2",
"karma-phantomjs-launcher": "1.0.0",
- "karma-requirejs": "0.2.2",
+ "karma-requirejs": "1.0.0",
"karma-coverage": "0.2.7",
- "minify": "^2.0.5",
- "requirejs": "2.1.22",
- "watch": "0.17.1"
+ "minify": "2.0.9",
+ "requirejs": "2.2.0",
+ "watch": "0.19.1"
},
"scripts": {
- "test": "npm run jshint --silent && npm run build && node_modules/karma/bin/karma start --single-run --browsers PhantomJS $GRUNT_OPTS",
+ "test": "npm run jshint --silent && npm run build --silent && node_modules/karma/bin/karma start --single-run --browsers PhantomJS $GRUNT_OPTS",
"debug": "npm run build && node_modules/karma/bin/karma start --browsers Chrome $GRUNT_OPTS",
"watch": "npm run compass-watch & npm run handlebars-watch",
"watch-test": "node_modules/karma/bin/karma start",