Bugfix for "comparison" and "blinkDiff" parameter - both can be used now

YahooArchive · Dec 11, 2014 · 2e742fe · 2e742fe
1 parent 52194be
commit 2e742fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+v0.9.4
+* Bugfix for "comparison" and "blinkDiff" parameter - both can be used now
+
 v0.9.3 - 11/05/14
 * Use "comparison" for comparison options instead of "blinkDiff". "blinkDiff" is deprecated.
 * Added global config

diff --git a/lib/kobold.js b/lib/kobold.js
@@ -61,7 +61,7 @@ var Kobold = Base.extend(
 		this._failForOrphans = options.failForOrphans || false;
 		this._failOnAdditions = options.failOnAdditions || false;
 
-		this._comparison = options.comparison || options.blinkDiff || {};
+		this._comparison = utils.deepExtend({}, [options.comparison || {}, options.blinkDiff || {}]);
 
 		this._source = koboldCore.buildStorageAdapter(this._build, options.source || options.storage);
 		this._destination = koboldCore.buildStorageAdapter(this._build, options.destination || options.storage);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kobold",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Visual regression testing framework, comparing screenshots from multiple builds",
   "license": "MIT",
   "main": "index.js",