diff --git a/package.json b/package.json index 7d535b5..3346d9c 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,9 @@ "mocha": "~1.15", "chai": "~1.8", "karma": "~0.10", + "karma-chrome-launcher": "~0.1", "karma-firefox-launcher": "~0.1", - "karma-mocha": "~0.1" + "karma-mocha": "~0.1", + "karma-spec-reporter": "~0.0.6" } } diff --git a/package.json b/package.json index 7d535b5..3346d9c 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,9 @@ "mocha": "~1.15", "chai": "~1.8", "karma": "~0.10", + "karma-chrome-launcher": "~0.1", "karma-firefox-launcher": "~0.1", - "karma-mocha": "~0.1" + "karma-mocha": "~0.1", + "karma-spec-reporter": "~0.0.6" } } diff --git a/tasks/karma.js b/tasks/karma.js index c340485..e20aca5 100644 --- a/tasks/karma.js +++ b/tasks/karma.js @@ -1,27 +1,22 @@ -'use strict'; - -var path = require('path'); -var server = require('karma').server; - module.exports = function (grunt) { - grunt.registerMultiTask('karma', 'run karma.', function() { - var done = this.async(); - var options = this.options({ - background: false - }); - var data = this.data; + 'use strict'; - //merge options onto data, with data taking precedence - data = grunt.util._.merge(options, data); - data.configFile = path.resolve(data.configFile); - if (data.configFile) { - data.configFile = grunt.template.process(data.configFile); + var path = require('path'); + var server = require('karma').server; + + grunt.registerMultiTask('karma', 'run karma.', function(target) { + //merge data onto options, with data taking precedence + var options = grunt.util._.merge(this.options(), this.data), + done = this.async(); + + if (options.configFile) { + options.configFile = grunt.template.process(options.configFile); + options.configFile = path.resolve(options.configFile); } - server.start( - data, - function(code) { - done(!code); - }); + done = this.async(); + server.start(options, function(code) { + done(!code); + }); }); }; diff --git a/package.json b/package.json index 7d535b5..3346d9c 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,9 @@ "mocha": "~1.15", "chai": "~1.8", "karma": "~0.10", + "karma-chrome-launcher": "~0.1", "karma-firefox-launcher": "~0.1", - "karma-mocha": "~0.1" + "karma-mocha": "~0.1", + "karma-spec-reporter": "~0.0.6" } } diff --git a/tasks/karma.js b/tasks/karma.js index c340485..e20aca5 100644 --- a/tasks/karma.js +++ b/tasks/karma.js @@ -1,27 +1,22 @@ -'use strict'; - -var path = require('path'); -var server = require('karma').server; - module.exports = function (grunt) { - grunt.registerMultiTask('karma', 'run karma.', function() { - var done = this.async(); - var options = this.options({ - background: false - }); - var data = this.data; + 'use strict'; - //merge options onto data, with data taking precedence - data = grunt.util._.merge(options, data); - data.configFile = path.resolve(data.configFile); - if (data.configFile) { - data.configFile = grunt.template.process(data.configFile); + var path = require('path'); + var server = require('karma').server; + + grunt.registerMultiTask('karma', 'run karma.', function(target) { + //merge data onto options, with data taking precedence + var options = grunt.util._.merge(this.options(), this.data), + done = this.async(); + + if (options.configFile) { + options.configFile = grunt.template.process(options.configFile); + options.configFile = path.resolve(options.configFile); } - server.start( - data, - function(code) { - done(!code); - }); + done = this.async(); + server.start(options, function(code) { + done(!code); + }); }); }; diff --git a/test/karma.conf.js b/test/karma.conf.js index cf5f7c1..6c63217 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -17,12 +17,12 @@ ], // list of files to exclude - exclude : [], + //exclude : [], // use dolts reporter, as travis terminal does not support escaping sequences // possible values: 'dots', 'progress', 'junit', 'teamcity' // CLI --reporters progress - reporters : ['progress'], + reporters : ['spec'], // web server port // CLI --port 9876 @@ -39,7 +39,7 @@ // level of logging // possible values: karma.LOG_DISABLE || karma.LOG_ERROR || karma.LOG_WARN || karma.LOG_INFO || karma.LOG_DEBUG // CLI --log-level debug - logLevel : config.LOG_DEBUG, + logLevel : config.LOG_INFO, // enable / disable watching file and executing tests whenever any file changes // CLI --auto-watch --no-auto-watch @@ -69,14 +69,15 @@ reportSlowerThan : 500, preprocessors : { - // '**/client/js/*.js': 'coverage' + // '**/client/js/*.js': 'coverage' }, plugins : [ - 'karma-mocha', - // 'karma-chrome-launcher', + 'karma-chrome-launcher', 'karma-firefox-launcher', + 'karma-mocha', // 'karma-phantomjs-launcher' + 'karma-spec-reporter' ] }); };