From 11354e951cfb9c6affac85a06bd5f858b87fbb5a Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Wed, 20 Dec 2017 10:36:07 +0100 Subject: [PATCH] chore(project): migrate to new attach related Modeling APIs Related to bpmn-io/diagram-js#242 BREAKING CHANGE: * as documented in bpmn-io/diagram-js#242 a few modeling APIs changed; users of these APIs must adapt accordingly. --- .../modeling/behavior/CreateBoundaryEventBehaviorSpec.js | 2 +- .../modeling/behavior/ReplaceElementBehaviourSpec.js | 6 ++++-- test/spec/features/ordering/BpmnOrderingProviderSpec.js | 5 ++++- test/spec/features/ordering/Helper.js | 6 ++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/test/spec/features/modeling/behavior/CreateBoundaryEventBehaviorSpec.js b/test/spec/features/modeling/behavior/CreateBoundaryEventBehaviorSpec.js index acabf5af..8f4657c6 100644 --- a/test/spec/features/modeling/behavior/CreateBoundaryEventBehaviorSpec.js +++ b/test/spec/features/modeling/behavior/CreateBoundaryEventBehaviorSpec.js @@ -29,7 +29,7 @@ describe('features/modeling/behavior - create boundary events', function() { modeling.createShape(task, { x: 100, y: 100 }, rootElement); // when - var newEvent = modeling.createShape(intermediateEvent, { x: 50 + 15, y: 100 }, task, true); + var newEvent = modeling.createShape(intermediateEvent, { x: 50 + 15, y: 100 }, task, { attach: true }); // then expect(newEvent.type).to.equal('bpmn:BoundaryEvent'); diff --git a/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js b/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js index b95054ad..cb5673a1 100644 --- a/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js +++ b/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js @@ -14,6 +14,8 @@ var is = require('../../../../../lib/util/ModelUtil').is, var domQuery = require('min-dom/lib/query'); +var ATTACH = { attach: true }; + describe('features/modeling - move start event behavior', function() { @@ -335,7 +337,7 @@ describe('features/modeling - move start event behavior', function() { eventDefinitionType: 'bpmn:CancelEventDefinition' }); - modeling.moveElements([ newBoundaryEvent ], { x: 500, y: 0 }, subProcess, true); + modeling.moveElements([ newBoundaryEvent ], { x: 500, y: 0 }, subProcess, ATTACH); var movedBoundaryEvent = elementRegistry.filter(function(element) { return (element.type === 'bpmn:BoundaryEvent' && element.id !== 'BoundaryEvent_2'); @@ -367,7 +369,7 @@ describe('features/modeling - move start event behavior', function() { eventDefinitionType: 'bpmn:CancelEventDefinition' }); - modeling.moveElements([ newBoundaryEvent ], { x: 500, y: 0 }, subProcess, true); + modeling.moveElements([ newBoundaryEvent ], { x: 500, y: 0 }, subProcess, ATTACH); commandStack.undo(); diff --git a/test/spec/features/ordering/BpmnOrderingProviderSpec.js b/test/spec/features/ordering/BpmnOrderingProviderSpec.js index 1a940763..d1ce2c5d 100644 --- a/test/spec/features/ordering/BpmnOrderingProviderSpec.js +++ b/test/spec/features/ordering/BpmnOrderingProviderSpec.js @@ -15,7 +15,10 @@ var modelingModule = require('../../../../lib/features/modeling'), describe('features/modeling - ordering', function() { - var testModules = [ coreModule, modelingModule ]; + var testModules = [ + coreModule, + modelingModule + ]; describe('boundary events', function() { diff --git a/test/spec/features/ordering/Helper.js b/test/spec/features/ordering/Helper.js index 7d142896..e3360bc5 100644 --- a/test/spec/features/ordering/Helper.js +++ b/test/spec/features/ordering/Helper.js @@ -51,7 +51,9 @@ function move(elementIds, delta, targetId, isAttach) { target = targetId && getElement(targetId); } - return modeling.moveElements(elements, delta, target, isAttach); + var hints = isAttach ? { attach: true } : {}; + + return modeling.moveElements(elements, delta, target, hints); }); } @@ -78,7 +80,7 @@ function add(attrs, position, target, isAttach) { target = getElement(target); } - return modeling.createShape(attrs, position, target, isAttach); + return modeling.createShape(attrs, position, target, { attach: isAttach }); }); }