sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(tests): allow canvas options to be provided

This commit is contained in:
Nico Rehwaldt 2015-10-22 08:42:59 +02:00
parent 5b2308df32
commit b21fb7cec3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/helper/index.js
View File

@ -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 = {};