fixed cypress tests
This commit is contained in:
parent
4ad12a515d
commit
4055772bde
|
@ -109,12 +109,22 @@ def task_list_my_tasks(
|
||||||
HumanTaskModel.task_title,
|
HumanTaskModel.task_title,
|
||||||
HumanTaskModel.process_model_display_name,
|
HumanTaskModel.process_model_display_name,
|
||||||
HumanTaskModel.process_instance_id,
|
HumanTaskModel.process_instance_id,
|
||||||
|
|
||||||
|
ProcessInstanceModel.process_model_identifier,
|
||||||
|
ProcessInstanceModel.status.label("process_instance_status"), # type: ignore
|
||||||
|
ProcessInstanceModel.updated_at_in_seconds,
|
||||||
|
ProcessInstanceModel.created_at_in_seconds,
|
||||||
|
process_initiator_user.username.label("process_initiator_username"),
|
||||||
|
GroupModel.identifier.label("assigned_user_group_identifier"),
|
||||||
|
|
||||||
|
# func.max does not seem to return columns so we need to call both
|
||||||
func.max(ProcessInstanceModel.process_model_identifier),
|
func.max(ProcessInstanceModel.process_model_identifier),
|
||||||
func.max(ProcessInstanceModel.status.label("process_instance_status")), # type: ignore
|
func.max(ProcessInstanceModel.status.label("process_instance_status")), # type: ignore
|
||||||
func.max(ProcessInstanceModel.updated_at_in_seconds),
|
func.max(ProcessInstanceModel.updated_at_in_seconds),
|
||||||
func.max(ProcessInstanceModel.created_at_in_seconds),
|
func.max(ProcessInstanceModel.created_at_in_seconds),
|
||||||
func.max(process_initiator_user.username.label("process_initiator_username")),
|
func.max(process_initiator_user.username.label("process_initiator_username")),
|
||||||
func.max(GroupModel.identifier.label("assigned_user_group_identifier")),
|
func.max(GroupModel.identifier.label("assigned_user_group_identifier")),
|
||||||
|
|
||||||
potential_owner_usernames_from_group_concat_or_similar,
|
potential_owner_usernames_from_group_concat_or_similar,
|
||||||
).paginate(page=page, per_page=per_page, error_out=False)
|
).paginate(page=page, per_page=per_page, error_out=False)
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,6 @@ describe('process-models', () => {
|
||||||
.click();
|
.click();
|
||||||
cy.runPrimaryBpmnFile();
|
cy.runPrimaryBpmnFile();
|
||||||
|
|
||||||
// cy.getBySel('process-instance-list-link').click();
|
|
||||||
cy.getBySel('process-instance-show-link').click();
|
cy.getBySel('process-instance-show-link').click();
|
||||||
cy.getBySel('process-instance-delete').click();
|
cy.getBySel('process-instance-delete').click();
|
||||||
cy.contains('Are you sure');
|
cy.contains('Are you sure');
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
|
<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" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
|
||||||
<bpmn:process id="Process_bd2e724" isExecutable="true">
|
<bpmn:process id="Process_Model_Cypress_Test_Process" isExecutable="true">
|
||||||
<bpmn:startEvent id="StartEvent_1">
|
<bpmn:startEvent id="StartEvent_1">
|
||||||
<bpmn:outgoing>Flow_07vd2ar</bpmn:outgoing>
|
<bpmn:outgoing>Flow_07vd2ar</bpmn:outgoing>
|
||||||
</bpmn:startEvent>
|
</bpmn:startEvent>
|
||||||
|
|
|
@ -97,7 +97,7 @@ Cypress.Commands.add(
|
||||||
cy.reload(true);
|
cy.reload(true);
|
||||||
cy.contains('Process Model:').should('exist');
|
cy.contains('Process Model:').should('exist');
|
||||||
cy.contains(/Process Instance.*[kK]icked [oO]ff/).should('not.exist');
|
cy.contains(/Process Instance.*[kK]icked [oO]ff/).should('not.exist');
|
||||||
cy.contains('[data-qa=process-model-show-permissions-loaded]', 'true');
|
cy.getBySel('process-model-show-permissions-loaded').should('exist');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -152,17 +152,14 @@ Cypress.Commands.add('assertNoItemInPaginatedResults', () => {
|
||||||
cy.contains(/\b0–0 of 0 items/);
|
cy.contains(/\b0–0 of 0 items/);
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add(
|
Cypress.Commands.add('deleteProcessModelAndConfirm', (buttonId, groupId) => {
|
||||||
'deleteProcessModelAndConfirm',
|
cy.getBySel(buttonId).click();
|
||||||
(buttonId, groupId) => {
|
cy.contains('Are you sure');
|
||||||
cy.getBySel(buttonId).click();
|
cy.getBySel('delete-process-model-button-modal-confirmation-dialog')
|
||||||
cy.contains('Are you sure');
|
.find('.cds--btn--danger')
|
||||||
cy.getBySel('delete-process-model-button-modal-confirmation-dialog')
|
.click();
|
||||||
.find('.cds--btn--danger')
|
cy.url().should(
|
||||||
.click();
|
'include',
|
||||||
cy.url().should(
|
`process-groups/${modifyProcessIdentifierForPathParam(groupId)}`
|
||||||
'include',
|
);
|
||||||
`process-groups/${modifyProcessIdentifierForPathParam(groupId)}`
|
});
|
||||||
);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
Loading…
Reference in New Issue