bpmn-js 0.20.3 → 0.20.7

package/test/spec/features/modeling/behavior/util/LineAttachmentUtilSpec.js

@@ -4,6 +4,7 @@ var getAttachment = require('lib/features/modeling/behavior/util/LineAttachmentU
 
 var EPSILON = 0.1;
 
+
 describe('modeling/behavior/util - LineAttachmentUtil#getAttachment', function() {
 
   // test line
@@ -198,7 +199,7 @@ describe('modeling/behavior/util - LineAttachmentUtil#getAttachment', function()
     //     \
     //      *
     //
-    var otherLine = [
+    var floatingPointLine = [
       { x: 10.141592, y: 10.653589 },
       // -
       { x: 30.793238, y: 10.462643 },
@@ -212,7 +213,7 @@ describe('modeling/behavior/util - LineAttachmentUtil#getAttachment', function()
     it('float value segment', function() {
 
       // when
-      var attachment = getAttachment({ x: 20.197169, y: 5.399375 }, otherLine);
+      var attachment = getAttachment({ x: 20.197169, y: 5.399375 }, floatingPointLine);
 
       // then
       expect(attachment.type).to.equal('segment');
@@ -228,17 +229,64 @@ describe('modeling/behavior/util - LineAttachmentUtil#getAttachment', function()
     it('float value bendboint', function() {
 
       // when
-      var attachment = getAttachment({ x: 35.197169, y: 5.399375 }, otherLine);
+      var attachment = getAttachment({ x: 35.197169, y: 5.399375 }, floatingPointLine);
+
+      // then
+      expect(attachment.type).to.equal('bendpoint');
+      expect(attachment.segmentIndex).to.equal(1);
+      expect(attachment.bendpointIndex).to.equal(1);
+
+      // expect values to be roughly equal
+      expect(attachment.position.x).to.be.within(30.793 - EPSILON, 30.793 + EPSILON);
+      expect(attachment.position.y).to.be.within(10.463 - EPSILON, 10.463 + EPSILON);
+    });
+
+  });
+
+
+  describe('handle zero-length line', function() {
+
+    var zeroLengthLine = [
+      { x: 10, y: 10 },
+      // -
+      { x: 10, y: 10 }
+    ];
+
+
+    var zeroLengthFloatingPointLine = [
+      { x: 10.1, y: 10.12313 },
+      // -
+      { x: 10, y: 10.112 }
+    ];
+
+
+    it('should treat zero-length as bendpoint attach', function() {
+
+      // when
+      var attachment = getAttachment({ x: 15.1, y: 15.123 }, zeroLengthLine);
 
       // then
-      // expext values to be rounded to 3 decimal places
       expect(attachment).to.eql({
         type: 'bendpoint',
-        position: { x: 30.793, y: 10.463 },
-        bendpointIndex: 1,
-        segmentIndex: 0
+        position: { x: 10, y: 10 },
+        segmentIndex: 0,
+        bendpointIndex: 0
       });
+    });
+
 
+    it('should treat approx zero-length as bendpoint attach', function() {
+
+      // when
+      var attachment = getAttachment({ x: 15.1, y: 15.123 }, zeroLengthFloatingPointLine);
+
+      // then
+      expect(attachment).to.eql({
+        type: 'bendpoint',
+        position: { x: 10.1, y: 10.12313 },
+        segmentIndex: 0,
+        bendpointIndex: 0
+      });
     });
 
   });

package/test/spec/features/rules/BpmnRulesSpec.js

@@ -29,7 +29,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'Task', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -51,7 +51,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Task', 'IntermediateThrowEvent_Link', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -62,7 +62,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('IntermediateThrowEvent_Link', 'EndEvent_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -73,7 +73,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'IntermediateCatchEvent_Link', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -84,7 +84,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('IntermediateCatchEvent_Link', 'Task', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -113,7 +113,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataObjectReference', 'StartEvent_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -124,7 +124,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'DataObjectReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataOutputAssociation' }
       });
     }));
@@ -135,7 +135,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataObjectReference', 'EndEvent_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataInputAssociation' }
       });
     }));
@@ -146,7 +146,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EndEvent_None', 'DataObjectReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -157,7 +157,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Task', 'DataObjectReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataOutputAssociation' }
       });
     }));
@@ -168,7 +168,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataObjectReference', 'Task', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataInputAssociation' }
       });
     }));
@@ -179,7 +179,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('SubProcess', 'DataObjectReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataOutputAssociation' }
       });
     }));
@@ -190,7 +190,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataObjectReference', 'SubProcess', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataInputAssociation' }
       });
     }));
@@ -199,6 +199,50 @@ describe('features/modeling/rules - BpmnRules', function() {
     it('connect DataStoreReference -> StartEvent_None', inject(function() {
 
       expectCanConnect('DataStoreReference', 'StartEvent_None', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: false,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect DataObjectReference -> TextAnnotation', inject(function() {
+
+      expectCanConnect('DataObjectReference', 'TextAnnotation', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect TextAnnotation -> DataObjectReference', inject(function() {
+
+      expectCanConnect('TextAnnotation', 'DataObjectReference', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect DataStoreReference -> TextAnnotation', inject(function() {
+
+      expectCanConnect('DataStoreReference', 'TextAnnotation', {
+        sequenceFlow: false,
+        messageFlow: false,
+        association: true,
+        dataAssociation: false
+      });
+    }));
+
+
+    it('connect TextAnnotation -> DataStoreReference', inject(function() {
+
+      expectCanConnect('TextAnnotation', 'DataStoreReference', {
         sequenceFlow: false,
         messageFlow: false,
         association: true,
@@ -212,7 +256,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'DataStoreReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataOutputAssociation' }
       });
     }));
@@ -223,7 +267,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataStoreReference', 'EndEvent_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataInputAssociation' }
       });
     }));
@@ -234,7 +278,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EndEvent_None', 'DataStoreReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -245,7 +289,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Task', 'DataStoreReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataOutputAssociation' }
       });
     }));
@@ -256,7 +300,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataStoreReference', 'Task', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataInputAssociation' }
       });
     }));
@@ -267,7 +311,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('SubProcess', 'DataStoreReference', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataOutputAssociation' }
       });
     }));
@@ -278,7 +322,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('DataStoreReference', 'SubProcess', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: { type: 'bpmn:DataInputAssociation' }
       });
     }));
@@ -298,7 +342,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'Task', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -309,7 +353,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'ExclusiveGateway', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -320,7 +364,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'SubProcess', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -331,7 +375,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'BoundaryEvent_on_Task', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -342,7 +386,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'StartEvent_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -353,7 +397,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'BoundaryEvent_on_SubProcess', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -364,7 +408,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_nested', 'Task', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -375,7 +419,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_nested', 'EndEvent_nested', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -386,7 +430,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'BoundaryEvent_in_OtherProcess', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -397,7 +441,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('BoundaryEvent_on_SubProcess', 'Task_in_OtherProcess', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -408,7 +452,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Task_in_OtherProcess', 'BoundaryEvent_on_SubProcess', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -428,7 +472,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateCatchEvent_Message', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -439,7 +483,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateCatchEvent_Message', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -450,7 +494,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateCatchEvent_Signal', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -461,7 +505,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateCatchEvent_Condition', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -472,7 +516,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateCatchEvent_Timer', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -483,7 +527,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateCatchEvent', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -494,7 +538,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'IntermediateThrowEvent_Message', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -505,7 +549,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'ReceiveTask', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -516,7 +560,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'Task_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -527,7 +571,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'ParallelGateway', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -538,7 +582,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EventBasedGateway', 'ParallelGateway', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -558,7 +602,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('CompensationBoundary', 'Task', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -581,7 +625,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('CompensationBoundary', 'Gateway', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -593,7 +637,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('CompensationBoundary', 'IntermediateEvent', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -605,7 +649,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Task', 'TaskForCompensation', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -617,7 +661,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('TaskForCompensation', 'Task', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -638,7 +682,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'IntermediateThrowEvent_Message', {
         sequenceFlow: true,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -649,7 +693,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('StartEvent_None', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -660,7 +704,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('OtherParticipant', 'StartEvent_None', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -672,7 +716,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('OtherParticipant', 'StartEvent_Timer', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -684,7 +728,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('OtherParticipant', 'StartEvent_Message', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
 
@@ -696,7 +740,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EndEvent_None', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -707,7 +751,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EndEvent_Cancel', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -718,7 +762,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EndEvent_Message', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -729,7 +773,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('OtherParticipant', 'EndEvent_None', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -740,7 +784,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('IntermediateThrowEvent_Message', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -751,7 +795,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('IntermediateThrowEvent_None', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -762,7 +806,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('IntermediateThrowEvent_Signal', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -773,7 +817,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('OtherParticipant', 'IntermediateThrowEvent_Message', {
         sequenceFlow: false,
         messageFlow: false,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -784,7 +828,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Task_in_SubProcess', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -795,7 +839,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('EndEvent_None_in_SubProcess', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -806,7 +850,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('OtherParticipant', 'Task_in_SubProcess', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));
@@ -817,7 +861,7 @@ describe('features/modeling/rules - BpmnRules', function() {
       expectCanConnect('Participant', 'OtherParticipant', {
         sequenceFlow: false,
         messageFlow: true,
-        association: true,
+        association: false,
         dataAssociation: false
       });
     }));