Skip to content

Commit

Permalink
feat: Update to karma@0.12.
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Mar 11, 2014
1 parent 5474cfa commit f8fd175
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 3 additions & 3 deletions tasks/grunt-karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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(){});
Expand Down

0 comments on commit f8fd175

Please sign in to comment.