From 576b5f8a63bd49c5c9bce9ff323ea0e1d2d59048 Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Wed, 14 Dec 2022 17:45:31 -0500
Subject: [PATCH] process model cypress tests are passing w/ burnettk

---
 .../cypress/e2e/process_models.cy.js              | 15 ++++++++-------
 .../cypress/support/commands.js                   |  6 +++---
 .../src/routes/ProcessInstanceList.tsx            |  9 +++++----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/spiffworkflow-frontend/cypress/e2e/process_models.cy.js b/spiffworkflow-frontend/cypress/e2e/process_models.cy.js
index 86de9568..43fba108 100644
--- a/spiffworkflow-frontend/cypress/e2e/process_models.cy.js
+++ b/spiffworkflow-frontend/cypress/e2e/process_models.cy.js
@@ -35,7 +35,7 @@ describe('process-models', () => {
     cy.contains(`Process Model: ${newModelDisplayName}`);
 
     // go back to process model show by clicking on the breadcrumb
-    cy.contains(modelId).click();
+    cy.contains(modelDisplayName).click();
 
     cy.getBySel('delete-process-model-button').click();
     cy.contains('Are you sure');
@@ -47,6 +47,7 @@ describe('process-models', () => {
       `process-groups/${modifyProcessIdentifierForPathParam(groupId)}`
     );
     cy.contains(modelId).should('not.exist');
+    cy.contains(modelDisplayName).should('not.exist');
   });
 
   it('can create new bpmn, dmn, and json files', () => {
@@ -66,7 +67,7 @@ describe('process-models', () => {
     cy.wait(500);
     cy.contains(groupDisplayName).click();
     cy.createModel(groupId, modelId, modelDisplayName);
-    cy.contains(directParentGroupId).click();
+    cy.contains(groupDisplayName).click();
     cy.contains(modelDisplayName).click();
     cy.url().should(
       'include',
@@ -91,7 +92,7 @@ describe('process-models', () => {
     cy.get('input[name=file_name]').type(bpmnFileName);
     cy.contains('Save Changes').click();
     cy.contains(`Process Model File: ${bpmnFileName}`);
-    cy.contains(modelId).click();
+    cy.contains(modelDisplayName).click();
     cy.contains(`Process Model: ${modelDisplayName}`);
     // cy.getBySel('files-accordion').click();
     cy.contains(`${bpmnFileName}.bpmn`).should('exist');
@@ -109,7 +110,7 @@ describe('process-models', () => {
     cy.get('input[name=file_name]').type(dmnFileName);
     cy.contains('Save Changes').click();
     cy.contains(`Process Model File: ${dmnFileName}`);
-    cy.contains(modelId).click();
+    cy.contains(modelDisplayName).click();
     cy.contains(`Process Model: ${modelDisplayName}`);
     // cy.getBySel('files-accordion').click();
     cy.contains(`${dmnFileName}.dmn`).should('exist');
@@ -125,7 +126,7 @@ describe('process-models', () => {
     cy.contains(`Process Model File: ${jsonFileName}`);
     // wait for json to load before clicking away to avoid network errors
     cy.wait(500);
-    cy.contains(modelId).click();
+    cy.contains(modelDisplayName).click();
     cy.contains(`Process Model: ${modelDisplayName}`);
     // cy.getBySel('files-accordion').click();
     cy.contains(`${jsonFileName}.json`).should('exist');
@@ -157,7 +158,7 @@ describe('process-models', () => {
     cy.contains(groupDisplayName).click();
     cy.createModel(groupId, modelId, modelDisplayName);
 
-    cy.contains(`${directParentGroupId}`).click();
+    cy.contains(`${groupDisplayName}`).click();
     cy.contains('Add a process model');
     cy.contains(modelDisplayName).click();
     cy.url().should(
@@ -187,7 +188,7 @@ describe('process-models', () => {
       .click();
 
     // in breadcrumb
-    cy.contains(modelId).click();
+    cy.contains(modelDisplayName).click();
 
     cy.getBySel('delete-process-model-button').click();
     cy.contains('Are you sure');
diff --git a/spiffworkflow-frontend/cypress/support/commands.js b/spiffworkflow-frontend/cypress/support/commands.js
index 76b931cc..f7c4e846 100644
--- a/spiffworkflow-frontend/cypress/support/commands.js
+++ b/spiffworkflow-frontend/cypress/support/commands.js
@@ -87,15 +87,15 @@ Cypress.Commands.add('createModel', (groupId, modelId, modelDisplayName) => {
 Cypress.Commands.add(
   'runPrimaryBpmnFile',
   (expectAutoRedirectToHumanTask = false) => {
-    cy.contains('Run').click();
+    cy.contains('Start').click();
     if (expectAutoRedirectToHumanTask) {
       // the url changes immediately, so also make sure we get some content from the next page, "Task:", or else when we try to interact with the page, it'll re-render and we'll get an error with cypress.
       cy.url().should('include', `/tasks/`);
       cy.contains('Task: ');
     } else {
-      cy.contains(/Process Instance.*kicked off/);
+      cy.contains(/Process Instance.*[kK]icked [oO]ff/);
       cy.reload(true);
-      cy.contains(/Process Instance.*kicked off/).should('not.exist');
+      cy.contains(/Process Instance.*[kK]icked [oO]ff/).should('not.exist');
     }
   }
 );
diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
index b6c08b21..1d75db56 100644
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
@@ -21,10 +21,11 @@ export default function ProcessInstanceList() {
       <ProcessBreadcrumb
         hotCrumbs={[
           ['Process Groups', '/admin'],
-          [
-            `Process Model: ${processModelFullIdentifier}`,
-            `process_model:${processModelFullIdentifier}:link`,
-          ],
+          {
+            entityToExplode: processModelFullIdentifier,
+            entityType: 'process-model-id',
+            linkLastItem: true,
+          },
           ['Process Instances'],
         ]}
       />