diff --git a/Gruntfile.js b/Gruntfile.js index cd5e075d..df78ed5c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -345,7 +345,7 @@ module.exports = function ( grunt ) { configFile: '<%= build_dir %>/karma-unit.js' }, unit: { - runnerPort: 9101, + port: 9019, background: true }, continuous: { diff --git a/karma/karma-unit.tpl.js b/karma/karma-unit.tpl.js index 009bec52..9c231851 100644 --- a/karma/karma-unit.tpl.js +++ b/karma/karma-unit.tpl.js @@ -1,5 +1,5 @@ module.exports = function ( karma ) { - karma.configure({ + karma.set({ /** * From where to look for files, starting with the location of this file. */ @@ -18,7 +18,7 @@ module.exports = function ( karma ) { 'src/assets/**/*.js' ], frameworks: [ 'jasmine' ], - plugins: [ 'karma-jasmine', 'karma-firefox-launcher', 'karma-chrome-launcher', 'karma-phantomjs-launcher', 'karma-coffee-preprocessor' ], + plugins: [ 'karma-jasmine', 'karma-firefox-launcher', 'karma-coffee-preprocessor' ], preprocessors: { '**/*.coffee': 'coffee', }, diff --git a/package.json b/package.json index 6d0d7cc5..71ac544c 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,16 @@ "grunt-contrib-concat": "~0.3.0", "grunt-contrib-watch": "~0.4.0", "grunt-contrib-uglify": "~0.2.0", - "grunt-karma": "~0.5.0", "grunt-ngmin": "0.0.2", "grunt-html2js": "~0.1.3", "grunt-contrib-coffee": "~0.7.0", "grunt-coffeelint": "0.0.6", "grunt-conventional-changelog": "~0.1.1", - "grunt-bump": "0.0.6" + "grunt-bump": "0.0.6", + "karma-firefox-launcher": "^0.1.3", + "karma-jasmine": "^0.1.5", + "grunt-karma": "^0.8.2", + "karma-coffee-preprocessor": "^0.2.1", + "karma": "^0.12.9" } }