-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1372 from ProcessMaker/bugfix/ticket-593
Fix remove pools
- Loading branch information
Showing
14 changed files
with
627 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0"> | ||
<bpmn:process id="Process_1" isExecutable="true"> | ||
<bpmn:startEvent id="node_2" name="Start Event" /> | ||
<bpmn:textAnnotation id="node_3"> | ||
<bpmn:text>Text Annotation</bpmn:text> | ||
</bpmn:textAnnotation> | ||
</bpmn:process> | ||
<bpmn:collaboration id="collaboration_0"> | ||
<bpmn:participant id="node_1" name="Pool" processRef="Process_1" /> | ||
</bpmn:collaboration> | ||
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> | ||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="collaboration_0"> | ||
<bpmndi:BPMNShape id="node_1_di" bpmnElement="node_1"> | ||
<dc:Bounds x="80" y="110" width="600" height="300" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_2_di" bpmnElement="node_2"> | ||
<dc:Bounds x="170" y="250" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_3_di" bpmnElement="node_3"> | ||
<dc:Bounds x="440" y="160" width="150" height="30" /> | ||
</bpmndi:BPMNShape> | ||
</bpmndi:BPMNPlane> | ||
</bpmndi:BPMNDiagram> | ||
</bpmn:definitions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:pm="http://processmaker.com/BPMN/2.0/Schema.xsd" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0"> | ||
<bpmn:process id="Process_1" isExecutable="true"> | ||
<bpmn:startEvent id="node_2" name="Start Event"> | ||
<bpmn:outgoing>node_6</bpmn:outgoing> | ||
</bpmn:startEvent> | ||
<bpmn:task id="node_4" name="Form Task" pm:assignment="requester"> | ||
<bpmn:incoming>node_6</bpmn:incoming> | ||
</bpmn:task> | ||
<bpmn:sequenceFlow id="node_6" sourceRef="node_2" targetRef="node_4" /> | ||
<bpmn:textAnnotation id="node_3"> | ||
<bpmn:text>Text Annotation</bpmn:text> | ||
</bpmn:textAnnotation> | ||
<bpmn:association id="node_7" associationDirection="None" sourceRef="node_3" targetRef="node_4" /> | ||
</bpmn:process> | ||
<bpmn:collaboration id="collaboration_0"> | ||
<bpmn:participant id="node_1" name="Pool" processRef="Process_1" /> | ||
</bpmn:collaboration> | ||
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> | ||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="collaboration_0"> | ||
<bpmndi:BPMNShape id="node_1_di" bpmnElement="node_1"> | ||
<dc:Bounds x="80" y="110" width="600" height="300" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_2_di" bpmnElement="node_2"> | ||
<dc:Bounds x="170" y="250" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_3_di" bpmnElement="node_3"> | ||
<dc:Bounds x="440" y="160" width="150" height="30" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_4_di" bpmnElement="node_4"> | ||
<dc:Bounds x="290" y="230" width="116" height="76" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_6_di" bpmnElement="node_6"> | ||
<di:waypoint x="188" y="268" /> | ||
<di:waypoint x="348" y="268" /> | ||
</bpmndi:BPMNEdge> | ||
<bpmndi:BPMNEdge id="node_7_di" bpmnElement="node_7"> | ||
<di:waypoint x="445" y="174.01" /> | ||
<di:waypoint x="348" y="268" /> | ||
</bpmndi:BPMNEdge> | ||
</bpmndi:BPMNPlane> | ||
</bpmndi:BPMNDiagram> | ||
</bpmn:definitions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0"> | ||
<bpmn:process id="Process_1" isExecutable="true" /> | ||
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> | ||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1" /> | ||
</bpmndi:BPMNDiagram> | ||
</bpmn:definitions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:pm="http://processmaker.com/BPMN/2.0/Schema.xsd" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0"> | ||
<bpmn:process id="Process_1" isExecutable="true"> | ||
<bpmn:startEvent id="node_3" name="Start Event"> | ||
<bpmn:outgoing>node_6</bpmn:outgoing> | ||
</bpmn:startEvent> | ||
<bpmn:task id="node_4" name="Form Task" pm:assignment="requester"> | ||
<bpmn:incoming>node_6</bpmn:incoming> | ||
<bpmn:outgoing>node_9</bpmn:outgoing> | ||
</bpmn:task> | ||
<bpmn:sequenceFlow id="node_6" sourceRef="node_3" targetRef="node_4" /> | ||
<bpmn:endEvent id="node_7" name="End Event"> | ||
<bpmn:incoming>node_9</bpmn:incoming> | ||
</bpmn:endEvent> | ||
<bpmn:sequenceFlow id="node_9" sourceRef="node_4" targetRef="node_7" /> | ||
</bpmn:process> | ||
<bpmn:collaboration id="collaboration_0"> | ||
<bpmn:participant id="node_2" name="Pool" processRef="Process_1" /> | ||
</bpmn:collaboration> | ||
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> | ||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="collaboration_0"> | ||
<bpmndi:BPMNShape id="node_2_di" bpmnElement="node_2"> | ||
<dc:Bounds x="90" y="100" width="600" height="300" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_3_di" bpmnElement="node_3"> | ||
<dc:Bounds x="170" y="220" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_4_di" bpmnElement="node_4"> | ||
<dc:Bounds x="300" y="200" width="116" height="76" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_6_di" bpmnElement="node_6"> | ||
<di:waypoint x="188" y="238" /> | ||
<di:waypoint x="358" y="238" /> | ||
</bpmndi:BPMNEdge> | ||
<bpmndi:BPMNShape id="node_7_di" bpmnElement="node_7"> | ||
<dc:Bounds x="510" y="220" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_9_di" bpmnElement="node_9"> | ||
<di:waypoint x="358" y="238" /> | ||
<di:waypoint x="528" y="238" /> | ||
</bpmndi:BPMNEdge> | ||
</bpmndi:BPMNPlane> | ||
</bpmndi:BPMNDiagram> | ||
</bpmn:definitions> |
47 changes: 47 additions & 0 deletions
47
tests/e2e/fixtures/Pools-DeletePoolCommonSignalEvents.after.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:pm="http://processmaker.com/BPMN/2.0/Schema.xsd" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0"> | ||
<bpmn:process id="Process_1" isExecutable="true"> | ||
<bpmn:startEvent id="node_2" name="Start Event"> | ||
<bpmn:outgoing>node_6</bpmn:outgoing> | ||
</bpmn:startEvent> | ||
<bpmn:task id="node_3" name="Form Task" pm:assignment="requester"> | ||
<bpmn:incoming>node_6</bpmn:incoming> | ||
<bpmn:outgoing>node_8</bpmn:outgoing> | ||
</bpmn:task> | ||
<bpmn:sequenceFlow id="node_6" name="flow1" sourceRef="node_2" targetRef="node_3" /> | ||
<bpmn:endEvent id="node_9" name="Signal End Event"> | ||
<bpmn:incoming>node_8</bpmn:incoming> | ||
<bpmn:signalEventDefinition signalRef="global_1" /> | ||
</bpmn:endEvent> | ||
<bpmn:sequenceFlow id="node_8" name="flow2" sourceRef="node_3" targetRef="node_9" /> | ||
</bpmn:process> | ||
<bpmn:collaboration id="collaboration_0"> | ||
<bpmn:participant id="node_1" name="Pool" processRef="Process_1" /> | ||
</bpmn:collaboration> | ||
<bpmn:signal id="global_1" name="global signal 1" /> | ||
<bpmn:signal id="global_2" name="global signal 2" /> | ||
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> | ||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="collaboration_0"> | ||
<bpmndi:BPMNShape id="node_1_di" bpmnElement="node_1"> | ||
<dc:Bounds x="90" y="110" width="600" height="300" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_2_di" bpmnElement="node_2"> | ||
<dc:Bounds x="160" y="230" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_3_di" bpmnElement="node_3"> | ||
<dc:Bounds x="290" y="210" width="116" height="76" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_6_di" bpmnElement="node_6"> | ||
<di:waypoint x="178" y="248" /> | ||
<di:waypoint x="348" y="248" /> | ||
</bpmndi:BPMNEdge> | ||
<bpmndi:BPMNShape id="node_9_di" bpmnElement="node_9"> | ||
<dc:Bounds x="500" y="230" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_8_di" bpmnElement="node_8"> | ||
<di:waypoint x="348" y="248" /> | ||
<di:waypoint x="518" y="248" /> | ||
</bpmndi:BPMNEdge> | ||
</bpmndi:BPMNPlane> | ||
</bpmndi:BPMNDiagram> | ||
</bpmn:definitions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:pm="http://processmaker.com/BPMN/2.0/Schema.xsd" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0"> | ||
<bpmn:process id="Process_1" isExecutable="true"> | ||
<bpmn:startEvent id="node_2" name="Start Event"> | ||
<bpmn:outgoing>node_6</bpmn:outgoing> | ||
</bpmn:startEvent> | ||
<bpmn:task id="node_3" name="Form Task" pm:assignment="requester"> | ||
<bpmn:incoming>node_6</bpmn:incoming> | ||
<bpmn:outgoing>node_8</bpmn:outgoing> | ||
</bpmn:task> | ||
<bpmn:sequenceFlow id="node_6" name="flow1" sourceRef="node_2" targetRef="node_3" /> | ||
<bpmn:endEvent id="node_9" name="Signal End Event"> | ||
<bpmn:incoming>node_8</bpmn:incoming> | ||
<bpmn:signalEventDefinition signalRef="global_1" /> | ||
</bpmn:endEvent> | ||
<bpmn:sequenceFlow id="node_8" name="flow2" sourceRef="node_3" targetRef="node_9" /> | ||
<bpmn:sequenceFlow id="node_17" name="flow3" sourceRef="node_14" targetRef="node_15" /> | ||
<bpmn:sequenceFlow id="node_21" name="flow4" sourceRef="node_15" targetRef="node_19" /> | ||
</bpmn:process> | ||
<bpmn:collaboration id="collaboration_0"> | ||
<bpmn:participant id="node_1" name="Pool" processRef="Process_1" /> | ||
<bpmn:participant id="node_12" name="Pool" processRef="process_2" /> | ||
</bpmn:collaboration> | ||
<bpmn:signal id="global_1" name="global signal 1" /> | ||
<bpmn:process id="process_2"> | ||
<bpmn:startEvent id="node_14" name="Signal Start Event"> | ||
<bpmn:outgoing>node_17</bpmn:outgoing> | ||
<bpmn:signalEventDefinition /> | ||
</bpmn:startEvent> | ||
<bpmn:task id="node_15" name="Form Task" pm:assignment="requester"> | ||
<bpmn:incoming>node_17</bpmn:incoming> | ||
<bpmn:outgoing>node_21</bpmn:outgoing> | ||
</bpmn:task> | ||
<bpmn:endEvent id="node_19" name="Signal End Event"> | ||
<bpmn:incoming>node_21</bpmn:incoming> | ||
<bpmn:signalEventDefinition signalRef="global_2" /> | ||
</bpmn:endEvent> | ||
</bpmn:process> | ||
<bpmn:signal id="global_2" name="global signal 2" /> | ||
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> | ||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="collaboration_0"> | ||
<bpmndi:BPMNShape id="node_1_di" bpmnElement="node_1"> | ||
<dc:Bounds x="90" y="110" width="600" height="300" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_2_di" bpmnElement="node_2"> | ||
<dc:Bounds x="160" y="230" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_3_di" bpmnElement="node_3"> | ||
<dc:Bounds x="290" y="210" width="116" height="76" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_6_di" bpmnElement="node_6"> | ||
<di:waypoint x="178" y="248" /> | ||
<di:waypoint x="348" y="248" /> | ||
</bpmndi:BPMNEdge> | ||
<bpmndi:BPMNShape id="node_9_di" bpmnElement="node_9"> | ||
<dc:Bounds x="500" y="230" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_8_di" bpmnElement="node_8"> | ||
<di:waypoint x="348" y="248" /> | ||
<di:waypoint x="518" y="248" /> | ||
</bpmndi:BPMNEdge> | ||
<bpmndi:BPMNShape id="node_12_di" bpmnElement="node_12"> | ||
<dc:Bounds x="90" y="440" width="600" height="300" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_14_di" bpmnElement="node_14"> | ||
<dc:Bounds x="170" y="570" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNShape id="node_15_di" bpmnElement="node_15"> | ||
<dc:Bounds x="310" y="550" width="116" height="76" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_17_di" bpmnElement="node_17"> | ||
<di:waypoint x="188" y="588" /> | ||
<di:waypoint x="368" y="588" /> | ||
</bpmndi:BPMNEdge> | ||
<bpmndi:BPMNShape id="node_19_di" bpmnElement="node_19"> | ||
<dc:Bounds x="520" y="570" width="36" height="36" /> | ||
</bpmndi:BPMNShape> | ||
<bpmndi:BPMNEdge id="node_21_di" bpmnElement="node_21"> | ||
<di:waypoint x="368" y="588" /> | ||
<di:waypoint x="538" y="588" /> | ||
</bpmndi:BPMNEdge> | ||
</bpmndi:BPMNPlane> | ||
</bpmndi:BPMNDiagram> | ||
</bpmn:definitions> |
Oops, something went wrong.