diff --git a/package.json b/package.json index 898ee96..a57e5fb 100644 --- a/package.json +++ b/package.json @@ -23,22 +23,22 @@ "license": "MIT", "readmeFilename": "README.md", "dependencies": { - "optimist": "~0.6.0", + "optimist": "~0.6.1", "lodash": "~2.4.1" }, "devDependencies": { - "grunt": "~0.4.1", + "grunt": "~0.4.3", "expect.js": "~0.2.0", "grunt-release": "~0.5.1", "grunt-contrib-watch": "~0.2.0", "grunt-conventional-changelog": "~0.0.12", - "karma-mocha": "~0.1.0", - "karma": "~0.11.0", + "karma-mocha": "~0.1.1", + "karma": "~0.12.0", "karma-firefox-launcher": "~0.1.3", "karma-chrome-launcher": "~0.1.2" }, "peerDependencies": { "grunt": "0.4.x", - "karma": "~0.11.0" + "karma": "~0.12.0" } } diff --git a/tasks/grunt-karma.js b/tasks/grunt-karma.js index 3fbf7af..134097f 100644 --- a/tasks/grunt-karma.js +++ b/tasks/grunt-karma.js @@ -19,9 +19,9 @@ module.exports = function(grunt) { var options = this.options({ background: false, // allow passing of cli args on as client args, for example --grep=x - clientArgs: optimist.argv, - client: { args: optimist.argv } + client: { args: optimist.argv._ } }); + var data = this.data; //merge options onto data, with data taking precedence data = _.merge(options, data); @@ -36,7 +36,7 @@ module.exports = function(grunt) { runner.run(data, finished.bind(done)); return; } - + //allow karma to be run in the background so it doesn't block grunt if (data.background){ grunt.util.spawn({cmd: 'node', args: [path.join(__dirname, '..', 'lib', 'background.js'), JSON.stringify(data)]}, function(){});