Skip to content

Commit

Permalink
fix: Actually override the browsers array as documented.
Browse files Browse the repository at this point in the history
Fixes #94.
  • Loading branch information
dignifiedquire committed Mar 14, 2014
1 parent 83af6f9 commit b891456
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tasks/grunt-karma.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ module.exports = function(grunt) {
options.client.args = args;

var data = this.data;
//merge options onto data, with data taking precedence
// Merge options onto data, with data taking precedence.
data = _.merge(options, data);

// But override the browsers array.
data.browsers = this.data.browsers || data.browsers;

if (data.configFile) {
data.configFile = path.resolve(data.configFile);
data.configFile = grunt.template.process(data.configFile);
Expand Down

0 comments on commit b891456

Please sign in to comment.