From b21fb7cec3deba8af15cca82bb3c29e3990b418e Mon Sep 17 00:00:00 2001
From: Nico Rehwaldt <nico.rehwaldt@camunda.com>
Date: Thu, 22 Oct 2015 08:42:59 +0200
Subject: [PATCH] chore(tests): allow canvas options to be provided

---
 test/helper/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helper/index.js b/test/helper/index.js
index f57b8385..09ea8849 100644
--- a/test/helper/index.js
+++ b/test/helper/index.js
@@ -30,7 +30,7 @@
 
 var unique = require('lodash/array/unique'),
     isFunction = require('lodash/lang/isFunction'),
-    assign = require('lodash/object/assign'),
+    merge = require('lodash/object/merge'),
     forEach = require('lodash/collection/forEach');
 
 var TestContainer = require('mocha-test-container-support');
@@ -76,7 +76,7 @@ function bootstrapBpmnJS(BpmnJS, diagram, options, locals) {
       _locals = _locals();
     }
 
-    _options = assign({ container: testContainer }, OPTIONS || {}, _options || {});
+    _options = merge({ container: testContainer }, OPTIONS, _options);
 
     if (_locals) {
       var mockModule = {};