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

fix(rules): correct bpmn:Lane insert rule 

Closes #855
This commit is contained in:
Nico Rehwaldt 2018-08-28 16:02:49 +02:00 committed by Nico Rehwaldt
parent acff17fbd7
commit 374c7d7f18
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/features/rules/BpmnRules.js
View File

@ -803,6 +803,10 @@ function canConnectDataAssociation(source, target) {
function canInsert(shape, flow, position) {
if (!flow) {
return false;
}
if (Array.isArray(shape)) {
if (shape.length !== 1) {
return false;

25
test/spec/features/rules/BpmnRules.moveLane.bpmn Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="sid-38422fae-e03e-43a3-bef4-bd33b32041b2" targetNamespace="http://bpmn.io/bpmn" exporter="http://bpmn.io" exporterVersion="0.10.1">
<collaboration id="Collaboration_00p2rt7">
<participant id="Participant_1f9ghrx" processRef="Process_0td36v7" />
</collaboration>
<process id="Process_0td36v7">
<laneSet id="LaneSet_0pqv2qu">
<lane id="Lane_1" />
<lane id="Lane_2" />
</laneSet>
</process>
<bpmndi:BPMNDiagram id="BpmnDiagram_1">
<bpmndi:BPMNPlane id="BpmnPlane_1" bpmnElement="Collaboration_00p2rt7">
<bpmndi:BPMNShape id="Participant_1f9ghrx_di" bpmnElement="Participant_1f9ghrx">
<omgdc:Bounds x="96" y="100" width="600" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_1_di" bpmnElement="Lane_1">
<omgdc:Bounds x="126" y="100" width="570" height="125" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_2_di" bpmnElement="Lane_2">
<omgdc:Bounds x="126" y="225" width="570" height="125" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>

28
test/spec/features/rules/BpmnRulesSpec.js
View File

@ -1666,4 +1666,32 @@ describe('features/modeling/rules - BpmnRules', function() {
});
describe('integration', function() {
describe('move Lane', function() {
var testXML = require('./BpmnRules.moveLane.bpmn');
beforeEach(bootstrapModeler(testXML, { modules: testModules }));
it('should disallow', inject(function(elementRegistry, rules) {
// given
var lane = elementRegistry.get('Lane_1');
// when
var result = rules.allowed('elements.move', {
shapes: [ lane ]
});
// then
expect(result).to.be.false;
}));
});
});
});