grunt-karma-sonar
Advanced tools
Comparing version 0.2.5 to 0.2.6
@@ -1,3 +0,3 @@ | ||
<a name="0.2.5"></a> | ||
# 0.2.4 (2015-06-09) | ||
<a name="0.2.6"></a> | ||
# 0.2.6 (2015-06-09) | ||
@@ -4,0 +4,0 @@ ## Bug Fixes |
{ | ||
"name": "grunt-karma-sonar", | ||
"description": "Grunt plugin for integrating karma reports with sonar", | ||
"version": "0.2.5", | ||
"version": "0.2.6", | ||
"homepage": "https://github.com/mdasberg/grunt-karma-sonar", | ||
@@ -6,0 +6,0 @@ "author": { |
@@ -45,8 +45,8 @@ 'use strict'; | ||
function mergeJson(original, override) { | ||
return _.merge(original, override, function (a, b) { | ||
if (_.isArray(a)) { | ||
return a.concat(b); | ||
return _.merge(original, override, function (a, b, key, aParent, bParent) { | ||
if (_.isUndefined(b)) { | ||
aParent[key] = undefined; | ||
return; | ||
} | ||
}); | ||
} | ||
@@ -74,3 +74,3 @@ | ||
if (value !== undefined && value !== null) { | ||
if (value !== undefined) { | ||
args.push('-D' + prop + '=' + value); | ||
@@ -77,0 +77,0 @@ } |
Sorry, the diff of this file is not supported yet
1495
205296