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): use different fixtures for different use cases

This commit is contained in:
pedesen 2015-08-03 17:03:46 +02:00
parent d4bcf68654
commit 022bc9f192
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/fixtures/bpmn/draw/activity-markers-simple.bpmn vendored
View File

@ -14,12 +14,6 @@
<bpmn2:subProcess id="SubProcess" />
<bpmn2:transaction id="Transaction" />
<bpmn2:adHocSubProcess id="AdHocSubProcess" />
<bpmn2:boundaryEvent id="BoundaryEvent_1" attachedToRef="Task">
<bpmn2:messageEventDefinition />
</bpmn2:boundaryEvent>
<bpmn2:boundaryEvent id="BoundaryEvent_2" cancelActivity="false" attachedToRef="Task">
<bpmn2:messageEventDefinition />
</bpmn2:boundaryEvent>
</bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
@ -44,18 +38,6 @@
<bpmndi:BPMNShape id="AdHocSubProcess_di" bpmnElement="AdHocSubProcess">
<dc:Bounds x="667" y="100" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_1_di" bpmnElement="BoundaryEvent_1">
<dc:Bounds x="532" y="162" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="505" y="198" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_2_di" bpmnElement="BoundaryEvent_2">
<dc:Bounds x="593" y="162" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="566" y="198" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn2:definitions>

30
test/fixtures/bpmn/features/replace/01_replace.bpmn vendored
View File

@ -24,8 +24,13 @@
</bpmn:startEvent>
<bpmn:task id="Task_2">
<bpmn:incoming>SequenceFlow_4</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_5</bpmn:outgoing>
</bpmn:task>
<bpmn:sequenceFlow id="SequenceFlow_4" sourceRef="StartEvent_2" targetRef="Task_2" />
<bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1">
<bpmn:incoming>SequenceFlow_5</bpmn:incoming>
</bpmn:intermediateThrowEvent>
<bpmn:sequenceFlow id="SequenceFlow_5" sourceRef="Task_2" targetRef="IntermediateThrowEvent_1" />
</bpmn:subProcess>
<bpmn:transaction id="Transaction_1" />
<bpmn:subProcess id="SubProcessCollapsed" />
@ -89,19 +94,19 @@
<dc:Bounds x="490" y="138" width="350" height="200" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="StartEvent_2_di" bpmnElement="StartEvent_2">
<dc:Bounds x="153" y="218" width="36" height="36" />
<dc:Bounds x="134" y="179" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="126" y="254" width="90" height="20" />
<dc:Bounds x="107" y="215" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_2_di" bpmnElement="Task_2">
<dc:Bounds x="287" y="196" width="100" height="80" />
<dc:Bounds x="268" y="157" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_4_di" bpmnElement="SequenceFlow_4">
<di:waypoint xsi:type="dc:Point" x="189" y="236" />
<di:waypoint xsi:type="dc:Point" x="287" y="236" />
<di:waypoint xsi:type="dc:Point" x="170" y="197" />
<di:waypoint xsi:type="dc:Point" x="268" y="197" />
<bpmndi:BPMNLabel>
<dc:Bounds x="193" y="226" width="90" height="20" />
<dc:Bounds x="174" y="187" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="SubProcessCollapsed_di" bpmnElement="SubProcessCollapsed">
@ -125,6 +130,19 @@
<dc:Bounds x="235" y="110" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="IntermediateThrowEvent_1_di" bpmnElement="IntermediateThrowEvent_1">
<dc:Bounds x="300" y="279" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="273" y="315" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_5_di" bpmnElement="SequenceFlow_5">
<di:waypoint xsi:type="dc:Point" x="318" y="237" />
<di:waypoint xsi:type="dc:Point" x="318" y="279" />
<bpmndi:BPMNLabel>
<dc:Bounds x="273" y="248" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>

12
test/spec/features/popup-menu/PopupMenuSpec.js
View File

@ -27,13 +27,11 @@ function queryPopup(popupMenu, selector) {
describe('features/popup-menu', function() {
var diagramXML = require('../../../fixtures/bpmn/draw/activity-markers-simple.bpmn');
var diagramXMLMarkers = require('../../../fixtures/bpmn/draw/activity-markers-simple.bpmn'),
diagramXMLReplace = require('../../../fixtures/bpmn/features/replace/01_replace.bpmn');
var testModules = [ coreModule, modelingModule, popupMenuModule, replaceModule ];
beforeEach(bootstrapModeler(diagramXML, { modules: testModules }));
var openPopup = function(element, offset) {
offset = offset || 100;
@ -45,6 +43,8 @@ describe('features/popup-menu', function() {
describe('toggle', function(){
beforeEach(bootstrapModeler(diagramXMLMarkers, { modules: testModules }));
describe('active attribute', function(){
it('should be true for parallel marker', inject(function(popupMenu, bpmnReplace, elementRegistry) {
@ -443,6 +443,8 @@ describe('features/popup-menu', function() {
describe('replacing', function() {
beforeEach(bootstrapModeler(diagramXMLMarkers, { modules: testModules }));
it('should retain the loop characteristics', inject(function(popupMenu, bpmnReplace, elementRegistry) {
// given
@ -525,6 +527,8 @@ describe('features/popup-menu', function() {
describe('replace menu', function() {
beforeEach(bootstrapModeler(diagramXMLReplace, { modules: testModules }));
it('should contain all boundary events for an interrupting boundary event',
inject(function(popupMenu, bpmnReplace, elementRegistry) {