From 649d454bc05731fa78a2917cc3c183bd81e27716 Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Thu, 6 Apr 2023 11:42:24 -0400
Subject: [PATCH] moved NDR_PP1 tests to pilot dir and default configs back to
 what they were w/ burnettk

---
 spiffworkflow-frontend/cypress.env.json                      | 5 +----
 .../cypress/{e2e => pilot}/NDR_PP1/consultingfees.cy.js      | 0
 .../cypress/{e2e => pilot}/NDR_PP1/equipment.cy.js           | 0
 .../cypress/{e2e => pilot}/NDR_PP1/learninganddev.cy.js      | 0
 .../cypress/{e2e => pilot}/NDR_PP1/otherfees.cy.js           | 0
 .../cypress/{e2e => pilot}/NDR_PP1/softwarelicense.cy.js     | 0
 spiffworkflow-frontend/cypress/support/commands.js           | 5 ++---
 7 files changed, 3 insertions(+), 7 deletions(-)
 rename spiffworkflow-frontend/cypress/{e2e => pilot}/NDR_PP1/consultingfees.cy.js (100%)
 rename spiffworkflow-frontend/cypress/{e2e => pilot}/NDR_PP1/equipment.cy.js (100%)
 rename spiffworkflow-frontend/cypress/{e2e => pilot}/NDR_PP1/learninganddev.cy.js (100%)
 rename spiffworkflow-frontend/cypress/{e2e => pilot}/NDR_PP1/otherfees.cy.js (100%)
 rename spiffworkflow-frontend/cypress/{e2e => pilot}/NDR_PP1/softwarelicense.cy.js (100%)

diff --git a/spiffworkflow-frontend/cypress.env.json b/spiffworkflow-frontend/cypress.env.json
index a7a77bd5d..6a14dd826 100644
--- a/spiffworkflow-frontend/cypress.env.json
+++ b/spiffworkflow-frontend/cypress.env.json
@@ -1,7 +1,5 @@
 {   
     "project_id": "18606",
-    "SPIFFWORKFLOW_FRONTEND_USERNAME": "core-a1.contributor",
-    "SPIFFWORKFLOW_FRONTEND_PASSWORD": "core-a1.contributor",
     "requestor_username": "core-a1.contributor",
     "requestor_password": "core-a1.contributor",
     "budgetowner_username": "fluffy.project-lead",
@@ -15,6 +13,5 @@
     "infrasme_username": "infra-a1.sme",
     "infrasme_password": "infra-a1.sme",
     "legalsme_username": "legal-a1.sme",
-    "legalsme_password": "legal-a1.sme",
-    "SPIFFWORKFLOW_FRONTEND_AUTH_WITH_KEYCLOAK": true
+    "legalsme_password": "legal-a1.sme"
 }
diff --git a/spiffworkflow-frontend/cypress/e2e/NDR_PP1/consultingfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js
similarity index 100%
rename from spiffworkflow-frontend/cypress/e2e/NDR_PP1/consultingfees.cy.js
rename to spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js
diff --git a/spiffworkflow-frontend/cypress/e2e/NDR_PP1/equipment.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js
similarity index 100%
rename from spiffworkflow-frontend/cypress/e2e/NDR_PP1/equipment.cy.js
rename to spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js
diff --git a/spiffworkflow-frontend/cypress/e2e/NDR_PP1/learninganddev.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js
similarity index 100%
rename from spiffworkflow-frontend/cypress/e2e/NDR_PP1/learninganddev.cy.js
rename to spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js
diff --git a/spiffworkflow-frontend/cypress/e2e/NDR_PP1/otherfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js
similarity index 100%
rename from spiffworkflow-frontend/cypress/e2e/NDR_PP1/otherfees.cy.js
rename to spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js
diff --git a/spiffworkflow-frontend/cypress/e2e/NDR_PP1/softwarelicense.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js
similarity index 100%
rename from spiffworkflow-frontend/cypress/e2e/NDR_PP1/softwarelicense.cy.js
rename to spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js
diff --git a/spiffworkflow-frontend/cypress/support/commands.js b/spiffworkflow-frontend/cypress/support/commands.js
index 206ffa2df..6f3c9157f 100644
--- a/spiffworkflow-frontend/cypress/support/commands.js
+++ b/spiffworkflow-frontend/cypress/support/commands.js
@@ -98,14 +98,13 @@ Cypress.Commands.add('createModel', (groupId, modelId, modelDisplayName) => {
   cy.contains(`Process Model: ${modelDisplayName}`);
 });
 
+// Intended to be run from the process model show page
 Cypress.Commands.add(
   'runPrimaryBpmnFile',
   (expectAutoRedirectToHumanTask = false) => {
     // cy.getBySel('start-process-instance').click();
     // click on button with text Start
-    //cy.get('button')
-    // cy.get('#process-model-tile-manage-procurement\\/procurement\\/requisition-order-management\\/new-demand-request-procurement > div > button')
-    cy.get('#process-model-tile-manage-procurement\\/procurement\\/requisition-order-management\\/raise-new-demand-request > div > button')
+    cy.get('button')
       .contains(/^Start$/)
       .click();
     if (expectAutoRedirectToHumanTask) {