Merge remote-tracking branch 'origin/main' into feature/safari_dropdown_bug

Jenkinsfile

@@ -1,3 +1,5 @@
+import groovy.json.JsonBuilder
+
 pipeline {
   agent { label 'linux' }
 
@@ -45,6 +47,17 @@ pipeline {
   }
 
   stages {
+    stage('Prep') {
+      steps { script {
+        def jobMetaJson = new JsonBuilder([
+          git_commit: env.GIT_COMMIT.take(7),
+          git_branch: env.GIT_BRANCH,
+          build_id:   env.BUILD_ID,
+        ]).toPrettyString()
+        sh "echo '${jobMetaJson}' > version_info.json"
+      } }
+    }
+
     stage('Build') {
       steps { script {
         dir("spiffworkflow-${params.COMPONENT}") {

spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js

@@ -86,7 +86,7 @@ const submitWithUser = (
 };
 
 //Consulting Fees Path - Without Files
-describe('Consulting Fees Path - Without Files', () => {
+describe.only('Consulting Fees Path - Without Files', () => {
   Cypress._.times(1, () => {
     //Budget owner approves the request
     it('Budget owner approves', () => {

spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js

@@ -89,7 +89,7 @@ const submitWithUser = (
 };
 
 //Equipment Path - Without Files
-describe('Equipment Path - Without Files', () => {
+describe.only('Equipment Path - Without Files', () => {
 
     Cypress._.times(1, () => {
         //Out of Policy. People Ops Partner Group and Budget owner approves the request

spiffworkflow-frontend/cypress/pilot/NDR_PP1/initiaterequest.cy.js

@@ -1,6 +1,6 @@
 
 //Software and License - Without Files
-describe('Initiate a Request - Without Files', () => {
+describe.only('Initiate a Request - Without Files', () => {
     Cypress._.times(1, () => {
         //Submit a Software and License request - Without Files
         it('Submit a Software and License request', () => {
@@ -610,7 +610,7 @@ describe('Initiate a Request - Without Files', () => {
         });
 
         //Cancel a Software and License request 2- Without Files
-        it.only('Cancel a Software and License request 2', () => {
+        it('Cancel a Software and License request 2', () => {
             let username = Cypress.env('requestor_username');
             let password = Cypress.env('requestor_password');
             cy.log('=====username : ' + username);

spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js

@@ -85,7 +85,7 @@ const submitWithUser = (
 };
 
 //Learning and Development Path - Without Files
-describe('Learning and Development Path - Without Files', () => {
+describe.only('Learning and Development Path - Without Files', () => {
 
     Cypress._.times(1, () => {
         //People Ops Partner Group approves the request
@@ -252,7 +252,7 @@ describe('Learning and Development Path - Without Files', () => {
                  cy.contains('Task: Enter NDR Items', { timeout: 60000 });
  */
                 cy.get('#root_item_0_sub_category').select('books');
-                cy.get('#root_item_0_item_name').clear().type('The role of the L&D function has evolved to meet the demands of digital transformation and a modern workforce.');
+                cy.get('#root_item_0_item_name').clear().type('The role of the L&D function has evolved to meet the demands of digital transformation and a modern.');
                 cy.get('#root_item_0_qty').clear().type('5');
                 cy.get('#root_item_0_currency_type').select('Fiat');
                 cy.get('#root_item_0_currency').select('EUR');

spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js

@@ -85,7 +85,7 @@ const submitWithUser = (
   cy.wait(2000);
 };
 
-describe('Other Fees Path - Without Files', () => {
+describe.only('Other Fees Path - Without Files', () => {
 
   Cypress._.times(1, () => {
     //Budget owner approves the request

spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js

@@ -88,7 +88,7 @@ const submitWithUser = (
 };
 
 //Software and Licenses Path - Without Files
-describe('Software and Licenses Path - Without Files', () => {
+describe.only('Software and Licenses Path - Without Files', () => {
 
     Cypress._.times(1, () => {
 

spiffworkflow-frontend/cypress/support/commands.js

@@ -59,11 +59,13 @@ Cypress.Commands.add('login', (username, password) => {
 });
 
 Cypress.Commands.add('logout', (selector, ...args) => {
-  cy.getBySel('logout-button').click();
+  cy.wait(2000);
-
+  //cy.getBySel('logout-button').click();
+  cy.get('#root > div > header > div.cds--header__global > span:nth-child(3) > button > svg').click();
   if (Cypress.env('SPIFFWORKFLOW_FRONTEND_AUTH_WITH_KEYCLOAK') === true) {
     // otherwise we can click logout, quickly load the next page, and the javascript
     // doesn't have time to actually sign you out
+    //cy.wait(4000);
     cy.contains('Sign in to your account');
   } else {
     cy.get('#spiff-login-button').should('exist');
@@ -104,7 +106,10 @@ Cypress.Commands.add(
   (expectAutoRedirectToHumanTask = false, returnToProcessModelShow = true) => {
     // cy.getBySel('start-process-instance').click();
     // click on button with text Start
-    cy.get('button')
+    //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\\/request-goods-services > div > button')
+      //cy.get('#process-model-tile-manage-procurement\\/procurement\\/requisition-order-management\\/raise-new-demand-request > div > button')
       .contains(/^Start$/)
       .click();
     if (expectAutoRedirectToHumanTask) {