diff --git a/cypress/e2e/process_instances.cy.js b/cypress/e2e/process_instances.cy.js index 4b779e3..5285f27 100644 --- a/cypress/e2e/process_instances.cy.js +++ b/cypress/e2e/process_instances.cy.js @@ -71,7 +71,7 @@ describe('process-instances', () => { cy.runPrimaryBpmnFile(dmnOutputForKevin); }); - it.only('can paginate items', () => { + it('can paginate items', () => { // make sure we have some process instances cy.runPrimaryBpmnFile('Very wonderful'); cy.runPrimaryBpmnFile('Very wonderful'); @@ -110,6 +110,9 @@ describe('process-instances', () => { date.setHours(date.getHours() - 1); filterByDate(date); assertAtLeastOneItemInPaginatedResults(); + + // make sure we are at the bottom of the page + cy.scrollTo(0, 1000) cy.getBySel("process-instance-status").contains("not_started"); date.setHours(date.getHours() + 2); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 354f498..52a7575 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -54,7 +54,7 @@ Cypress.Commands.add('createModel', (groupId, modelId, modelDisplayName) => { }); Cypress.Commands.add('runPrimaryBpmnFile', (expectedText) => { - cy.contains('Run Primary').click(); + cy.contains('Run').click(); cy.contains(expectedText); cy.reload(true) cy.contains(expectedText).should('not.exist'); diff --git a/src/routes/ProcessModelShow.js b/src/routes/ProcessModelShow.js index d712585..10d72b1 100644 --- a/src/routes/ProcessModelShow.js +++ b/src/routes/ProcessModelShow.js @@ -30,12 +30,30 @@ export default function ProcessModelShow() { ) }, [params]); - const processModelRun = ((event) => { + const processInstanceCreateAndRun = ((event) => { fetch(`${BACKEND_BASE_URL}/process-models/${processModel.process_group_id}/${processModel.id}`, { headers: new Headers({ 'Authorization': `Bearer ${HOT_AUTH_TOKEN}` }), method: 'POST', + }) + .then(res => res.json()) + .then( + (result) => { + processModelRun(result); + }, + (error) => { + console.log(error); + } + ) + }); + + const processModelRun = ((processInstance) => { + fetch(`${BACKEND_BASE_URL}/process-models/${processModel.process_group_id}/${processModel.id}/process-instances/${processInstance.id}/run`, { + headers: new Headers({ + 'Authorization': `Bearer ${HOT_AUTH_TOKEN}` + }), + method: 'POST', }) .then(res => res.json()) .then( @@ -82,7 +100,7 @@ export default function ProcessModelShow() {
- +