feat: Merge all client.args as suggested in #79.

karma-runner · Mar 14, 2014 · b658ec9 · b658ec9
1 parent 168f7b7
commit b658ec9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -31,7 +31,6 @@ module.exports = function(grunt) {
         ],
         frameworks: ['mocha'],
         plugins: plugins,
-        //client: {captureConsole: true}
       },
       single: {
         singleRun: true

diff --git a/tasks/grunt-karma.js b/tasks/grunt-karma.js
@@ -29,22 +29,31 @@ module.exports = function(grunt) {
             return '--grep=' + arg;
         });
     }
-    options.client.args = args;
+    if (_.isArray(options.client.args)) {
+        options.client.args = options.client.args.concat(args);
+    } else {
+        options.client.args = args;
+    }
 
     // Merge karma default options
-    options.client = _.defaults(options.client, {
+    _.defaults(options.client, {
         args: [],
         useIframe: true,
         captureConsole: true
     });
 
-    var data = this.data;
+    var opts = _.cloneDeep(options);
     // Merge options onto data, with data taking precedence.
-    data = _.merge(options, data);
+    var data = _.merge(opts, this.data);
 
     // But override the browsers array.
     data.browsers = this.data.browsers || data.browsers;
 
+    // Merge client.args
+    if (_.isArray(this.data.client.args)) {
+        data.client.args = this.data.client.args.concat(options.client.args);
+    }
+
     if (data.configFile) {
       data.configFile = path.resolve(data.configFile);
       data.configFile = grunt.template.process(data.configFile);