Fix test for get_zipped_files script
This commit is contained in:
parent
80560b96c4
commit
08e9628350
|
@ -16,6 +16,11 @@
|
|||
<camunda:constraint name="required" config="True" />
|
||||
</camunda:validation>
|
||||
</camunda:formField>
|
||||
<camunda:formField id="doc_code" label="'Doc Code'" type="string">
|
||||
<camunda:validation>
|
||||
<camunda:constraint name="required" config="True" />
|
||||
</camunda:validation>
|
||||
</camunda:formField>
|
||||
</camunda:formData>
|
||||
</bpmn:extensionElements>
|
||||
<bpmn:incoming>Flow_1o4d6ut</bpmn:incoming>
|
||||
|
@ -28,7 +33,7 @@
|
|||
<bpmn:script>to_zip = []
|
||||
for file_id in file_ids:
|
||||
to_zip.append(file_id['file_id'])
|
||||
zip_file = get_zipped_files(file_ids=to_zip)</bpmn:script>
|
||||
zip_file = get_zipped_files(file_ids=to_zip, doc_code=doc_code)</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_1uyi5u2" sourceRef="Activity_GetZip" targetRef="Activity_DisplayZip" />
|
||||
<bpmn:manualTask id="Activity_DisplayZip" name="Display Zipped Files">
|
||||
|
@ -46,10 +51,10 @@ zip_file = get_zipped_files(file_ids=to_zip)</bpmn:script>
|
|||
<bpmn:incoming>Flow_0r9uogm</bpmn:incoming>
|
||||
</bpmn:endEvent>
|
||||
<bpmn:sequenceFlow id="Flow_0r9uogm" sourceRef="Activity_04sw7a2" targetRef="Event_1wpd34m" />
|
||||
<bpmn:scriptTask id="Activity_GetZip_2" name="Get Zip with Doc Code">
|
||||
<bpmn:scriptTask id="Activity_GetZip_2" name="Get Zip 2">
|
||||
<bpmn:incoming>Flow_1i3xa3d</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0ic5xlg</bpmn:outgoing>
|
||||
<bpmn:script>zip_file_2 = get_zipped_files(file_ids=to_zip, doc_code='CRC2_IRBSubmission_ZipFile')</bpmn:script>
|
||||
<bpmn:script>zip_file_2 = get_zipped_files(file_ids=to_zip, doc_code=doc_code)</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:manualTask id="Activity_04sw7a2" name="Display Zip 2">
|
||||
<bpmn:documentation># Zip 2
|
||||
|
@ -60,6 +65,18 @@ zip_file = get_zipped_files(file_ids=to_zip)</bpmn:script>
|
|||
</bpmn:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_SayHello">
|
||||
<bpmndi:BPMNEdge id="Flow_0r9uogm_di" bpmnElement="Flow_0r9uogm">
|
||||
<di:waypoint x="1000" y="117" />
|
||||
<di:waypoint x="1072" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0ic5xlg_di" bpmnElement="Flow_0ic5xlg">
|
||||
<di:waypoint x="830" y="117" />
|
||||
<di:waypoint x="900" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1i3xa3d_di" bpmnElement="Flow_1i3xa3d">
|
||||
<di:waypoint x="662" y="117" />
|
||||
<di:waypoint x="730" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1uyi5u2_di" bpmnElement="Flow_1uyi5u2">
|
||||
<di:waypoint x="500" y="117" />
|
||||
<di:waypoint x="562" y="117" />
|
||||
|
@ -72,18 +89,6 @@ zip_file = get_zipped_files(file_ids=to_zip)</bpmn:script>
|
|||
<di:waypoint x="188" y="117" />
|
||||
<di:waypoint x="240" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1i3xa3d_di" bpmnElement="Flow_1i3xa3d">
|
||||
<di:waypoint x="662" y="117" />
|
||||
<di:waypoint x="730" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0ic5xlg_di" bpmnElement="Flow_0ic5xlg">
|
||||
<di:waypoint x="830" y="117" />
|
||||
<di:waypoint x="900" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0r9uogm_di" bpmnElement="Flow_0r9uogm">
|
||||
<di:waypoint x="1000" y="117" />
|
||||
<di:waypoint x="1072" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds x="152" y="99" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
@ -34,11 +34,12 @@ class TestGetZippedFiles(BaseTest):
|
|||
binary_data=b'1234', irb_doc_code='AD_Consent_Model')
|
||||
|
||||
file_ids = [{'file_id': model_1.id}, {'file_id': model_2.id}, {'file_id': model_3.id}]
|
||||
workflow_api = self.complete_form(workflow, task, {'file_ids': file_ids})
|
||||
workflow_api = self.complete_form(workflow, task, {'file_ids': file_ids,
|
||||
'doc_code': 'CRC2_IRBSubmission_ZipFile'})
|
||||
next_task = workflow_api.next_task
|
||||
file_model_id = next_task.data['zip_file']['id']
|
||||
|
||||
file_model = session.query(DocumentModel).filter(DocumentModel.file_model_id == file_model_id).first()
|
||||
file_model = session.query(DocumentModel).filter(DocumentModel.id == file_model_id).first()
|
||||
|
||||
# Test what we get back in the zipped file
|
||||
with zipfile.ZipFile(io.BytesIO(file_model.data), 'r') as zf:
|
||||
|
@ -56,7 +57,5 @@ class TestGetZippedFiles(BaseTest):
|
|||
|
||||
file_1 = session.query(DocumentModel).filter(DocumentModel.task_spec == 'Activity_GetZip').first()
|
||||
file_2 = session.query(DocumentModel).filter(DocumentModel.task_spec == 'Activity_GetZip_2').first()
|
||||
# file 1 should *not* have an irb doc code
|
||||
self.assertEqual(None, file_1.irb_doc_code)
|
||||
# file 2 *should* have an irb doc code
|
||||
self.assertEqual('CRC2_IRBSubmission_ZipFile', file_1.irb_doc_code)
|
||||
self.assertEqual('CRC2_IRBSubmission_ZipFile', file_2.irb_doc_code)
|
||||
|
|
Loading…
Reference in New Issue