From 4808e346f1a687d0d4c8308ef8c0bc8d973df629 Mon Sep 17 00:00:00 2001 From: Madhurya Liyanage Date: Wed, 31 May 2023 12:26:26 +0530 Subject: [PATCH] Updates to match the new UI changes --- .../pilot/NDR_PP1/consultingfees.cy.js | 77 +++---- .../cypress/pilot/NDR_PP1/equipment.cy.js | 160 +++++++------- .../pilot/NDR_PP1/initiaterequest.cy.js | 86 ++++---- .../pilot/NDR_PP1/learninganddev.cy.js | 118 ++++++----- .../cypress/pilot/NDR_PP1/otherfees.cy.js | 82 +++---- .../pilot/NDR_PP1/softwarelicense.cy.js | 200 +++++++++--------- 6 files changed, 384 insertions(+), 339 deletions(-) diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js index 77effb2a..10b61f7f 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js @@ -84,31 +84,32 @@ const submitWithUser = ( // .click(); // } - cy.get('button').contains('Return to Home', { timeout: 60000 }); + cy.wait(5000); + //cy.get('button').contains('Return to Home', { timeout: 60000 }); cy.logout(); }; - //Check if the process instance is completed successfully - const checkProcessInstanceCompleted = ( - username, - password, - processInstanceId +//Check if the process instance is completed successfully +const checkProcessInstanceCompleted = ( + username, + password, + processInstanceId ) => { - cy.wait(2000); - cy.log('========Login with : ', username); - cy.log('========processInstanceId: ', processInstanceId); - cy.login(username, password); + cy.wait(2000); + cy.log('========Login with : ', username); + cy.log('========processInstanceId: ', processInstanceId); + cy.login(username, password); - cy.wait(1000); - cy.visit('/admin/process-instances/find-by-id'); - cy.get('#process-instance-id-input').type(processInstanceId); + cy.wait(1000); + cy.visit('/admin/process-instances/find-by-id'); + cy.get('#process-instance-id-input').type(processInstanceId); - cy.get('button') - .contains(/^Submit$/) - .click(); + cy.get('button') + .contains(/^Submit$/) + .click(); - cy.wait(2000); - cy.get('#tag-1 > span').contains('complete'); + cy.wait(2000); + cy.get('#tag-1 > span').contains('complete'); } // Consulting Fees Path - Without Files @@ -233,12 +234,12 @@ describe.only('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.wait(3000); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -376,12 +377,12 @@ describe.only('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.wait(3000); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -521,12 +522,12 @@ describe.only('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.wait(3000); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -740,8 +741,8 @@ describe('Consulting Fees Path - With Files', () => { .click(); cy.wait(9000); - cy.visit('/'); - cy.contains('Started by me', { timeout: 60000 }); + + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -930,11 +931,11 @@ describe('Consulting Fees Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -1123,8 +1124,10 @@ describe('Consulting Fees Path - With Files', () => { .contains(/^Submit$/) .click(); cy.wait(9000); - cy.visit('/'); - cy.contains('Started by me', { timeout: 60000 }); + /*cy.get('button') + .contains(/^Return to Home$/) + .click();*/ + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js index 2b387216..285cd7cf 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js @@ -90,31 +90,32 @@ const submitWithUser = ( // .click(); // } - cy.get('button').contains('Return to Home', { timeout: 60000 }); + cy.wait(10000); + // cy.get('button').contains('Return to Home', { timeout: 60000 }); cy.logout(); }; - //Check if the process instance is completed successfully - const checkProcessInstanceCompleted = ( - username, - password, - processInstanceId +//Check if the process instance is completed successfully +const checkProcessInstanceCompleted = ( + username, + password, + processInstanceId ) => { - cy.wait(2000); - cy.log('========Login with : ', username); - cy.log('========processInstanceId: ', processInstanceId); - cy.login(username, password); + cy.wait(2000); + cy.log('========Login with : ', username); + cy.log('========processInstanceId: ', processInstanceId); + cy.login(username, password); - cy.wait(1000); - cy.visit('/admin/process-instances/find-by-id'); - cy.get('#process-instance-id-input').type(processInstanceId); + cy.wait(1000); + cy.visit('/admin/process-instances/find-by-id'); + cy.get('#process-instance-id-input').type(processInstanceId); - cy.get('button') - .contains(/^Submit$/) - .click(); + cy.get('button') + .contains(/^Submit$/) + .click(); - cy.wait(2000); - cy.get('#tag-1 > span').contains('complete'); + cy.wait(2000); + cy.get('#tag-1 > span').contains('complete'); } // Equipment Path - Without Files @@ -253,11 +254,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); cy.log('=====after logout ---'); @@ -382,11 +384,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -420,7 +423,7 @@ describe.only('Equipment Path - Without Files', () => { }); // Out of Policy. People Ops Partner Group approves and Budget owner request for additional details - it('Out of Policy. People Ops Partner Group approves and Budget owner needs more info', () => { + it.only('Out of Policy. People Ops Partner Group approves and Budget owner needs more info', () => { const username = Cypress.env('requestor_username'); const password = Cypress.env('requestor_password'); cy.log(`=====username : ${username}`); @@ -509,11 +512,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -663,11 +667,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -777,11 +782,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -891,11 +897,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1022,11 +1029,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1149,11 +1157,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1187,7 +1196,7 @@ describe.only('Equipment Path - Without Files', () => { }); // Within Policy. People Ops Partner Group approves and Budget owner request for additional details - it('Within Policy. People Ops Partner Group approves and Budget owner needs more info', () => { + it.only('Within Policy. People Ops Partner Group approves and Budget owner needs more info', () => { const username = Cypress.env('requestor_username'); const password = Cypress.env('requestor_password'); cy.log(`=====username : ${username}`); @@ -1276,11 +1285,12 @@ describe.only('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1519,11 +1529,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1696,11 +1706,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1872,11 +1882,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2076,11 +2086,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2240,11 +2250,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2403,11 +2413,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2583,11 +2593,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2759,11 +2769,11 @@ describe('Equipment Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2935,12 +2945,12 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(20000); - cy.get('button') + cy.wait(9000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/initiaterequest.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/initiaterequest.cy.js index 8624efc2..f844ad66 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/initiaterequest.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/initiaterequest.cy.js @@ -105,11 +105,12 @@ describe.only('Initiate a Request - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -192,11 +193,12 @@ describe.only('Initiate a Request - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -329,11 +331,12 @@ describe.only('Initiate a Request - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -723,11 +726,12 @@ describe.only('Initiate a Request - Without Files', () => { .contains(/^Cancel Request$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); }); }); @@ -836,11 +840,12 @@ describe.only('Initiate a Request - Without Files', () => { .contains(/^Cancel Request$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); }); }); @@ -1197,11 +1202,12 @@ describe('Form validation', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -1311,11 +1317,12 @@ describe('Form validation', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -1480,11 +1487,12 @@ describe('Initiate a Request - With Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -1659,11 +1667,12 @@ describe('Initiate a Request - With Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -1850,11 +1859,12 @@ describe('Initiate a Request - With Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); }); @@ -1991,11 +2001,10 @@ describe('Initiate a Request - With Files', () => { .contains(/^Save and Close$/) .click(); - cy.wait(3000); - - // cy.get('button') - // .contains(/^Return to Home$/) - // .click(); + cy.wait(6000); + /*cy.get('button') + .contains(/^Return to Home$/) + .click();*/ cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -2156,11 +2165,12 @@ describe('Initiate a Request - With Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); }); }); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js index b4d9b98c..1c6d748d 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js @@ -84,32 +84,33 @@ const submitWithUser = ( // .click(); // } - cy.get('button').contains('Return to Home', { timeout: 60000 }); + cy.wait(5000); + //cy.get('button').contains('Return to Home', { timeout: 60000 }); cy.logout(); }; - //Check if the process instance is completed successfully - const checkProcessInstanceCompleted = ( - username, - password, - processInstanceId +//Check if the process instance is completed successfully +const checkProcessInstanceCompleted = ( + username, + password, + processInstanceId ) => { - cy.wait(2000); - cy.log('========Login with : ', username); - cy.log('========processInstanceId: ', processInstanceId); - cy.login(username, password); + cy.wait(2000); + cy.log('========Login with : ', username); + cy.log('========processInstanceId: ', processInstanceId); + cy.login(username, password); - cy.wait(1000); - cy.visit('/admin/process-instances/find-by-id'); - cy.get('#process-instance-id-input').type(processInstanceId); + cy.wait(1000); + cy.visit('/admin/process-instances/find-by-id'); + cy.get('#process-instance-id-input').type(processInstanceId); - cy.get('button') - .contains(/^Submit$/) - .click(); + cy.get('button') + .contains(/^Submit$/) + .click(); - cy.wait(2000); - cy.get('#tag-1 > span').contains('complete'); + cy.wait(2000); + cy.get('#tag-1 > span').contains('complete'); } // Learning and Development Path - Without Files @@ -203,11 +204,12 @@ describe.only('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -317,11 +319,12 @@ describe.only('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -431,11 +434,12 @@ describe.only('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -592,11 +596,12 @@ describe.only('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -719,11 +724,12 @@ describe.only('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -833,11 +839,12 @@ describe.only('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -871,7 +878,7 @@ describe.only('Learning and Development Path - Without Files', () => { 'Task: Reminder: Check Existing Budget', 'approve' ); - + const peopleOpsUsername = Cypress.env('peopleopssme_username'); const peopleOpsPassword = Cypress.env('peopleopssme_password'); cy.log(`=====peopleOpsUsername : ${peopleOpsUsername}`); @@ -884,6 +891,7 @@ describe.only('Learning and Development Path - Without Files', () => { null, 'approve' ); + checkProcessInstanceCompleted(username, password, processInstanceId); }); }); @@ -1034,11 +1042,11 @@ describe('Learning and Development Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1199,11 +1207,11 @@ describe('Learning and Development Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1363,11 +1371,11 @@ describe('Learning and Development Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1575,11 +1583,11 @@ describe('Learning and Development Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1753,11 +1761,11 @@ describe('Learning and Development Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1918,11 +1926,11 @@ describe('Learning and Development Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js index 323116b3..242b96ca 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js @@ -84,34 +84,35 @@ const submitWithUser = ( // .click(); // } - cy.get('button').contains('Return to Home', { timeout: 60000 }); + cy.wait(5000); + //cy.get('button').contains('Return to Home', { timeout: 60000 }); cy.logout(); }; - //Check if the process instance is completed successfully - const checkProcessInstanceCompleted = ( - username, - password, - processInstanceId +//Check if the process instance is completed successfully +const checkProcessInstanceCompleted = ( + username, + password, + processInstanceId ) => { - cy.wait(2000); - cy.log('========Login with : ', username); - cy.log('========processInstanceId: ', processInstanceId); - cy.login(username, password); + cy.wait(2000); + cy.log('========Login with : ', username); + cy.log('========processInstanceId: ', processInstanceId); + cy.login(username, password); - cy.wait(1000); - cy.visit('/admin/process-instances/find-by-id'); - cy.get('#process-instance-id-input').type(processInstanceId); + cy.wait(1000); + cy.visit('/admin/process-instances/find-by-id'); + cy.get('#process-instance-id-input').type(processInstanceId); - cy.get('button') - .contains(/^Submit$/) - .click(); + cy.get('button') + .contains(/^Submit$/) + .click(); - cy.wait(2000); - cy.get('#tag-1 > span').contains('complete'); + cy.wait(2000); + cy.get('#tag-1 > span').contains('complete'); } -describe.only('Other Fees Path - Without Files', () => { +describe('Other Fees Path - Without Files', () => { Cypress._.times(1, () => { // Budget owner approves the request it('Budget owner approves', () => { @@ -216,11 +217,12 @@ describe.only('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -331,11 +333,12 @@ describe.only('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -446,11 +449,12 @@ describe.only('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -491,7 +495,7 @@ describe.only('Other Fees Path - Without Files', () => { }); }); -describe('Other Fees Path - With Files', () => { +describe.only('Other Fees Path - With Files', () => { Cypress._.times(1, () => { // Budget owner approves the request it('Budget owner approves', () => { @@ -646,12 +650,12 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(20000); - cy.get('button') + cy.wait(9000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -813,11 +817,11 @@ describe('Other Fees Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -979,11 +983,11 @@ describe('Other Fees Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(1000); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js index 625851e4..53ae6e8f 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js @@ -78,42 +78,43 @@ const submitWithUser = ( if (expectAdditionalApprovalInfoPage === 'Task: Update Application Landscape') { cy.contains(expectAdditionalApprovalInfoPage, { timeout: 60000 }); - + cy.get('button') .contains(/^Continue$/) .click(); } + cy.wait(5000); // cy.getBySel('return-to-home-button', { timeout: 60000 }); - cy.get('button').contains('Return to Home', { timeout: 60000 }); + //cy.get('button').contains('Return to Home', { timeout: 60000 }); cy.logout(); }; - //Check if the process instance is completed successfully - const checkProcessInstanceCompleted = ( - username, - password, - processInstanceId - ) => { - cy.wait(2000); - cy.log('========Login with : ', username); - cy.log('========processInstanceId: ', processInstanceId); - cy.login(username, password); - - cy.wait(1000); - cy.visit('/admin/process-instances/find-by-id'); - cy.get('#process-instance-id-input').type(processInstanceId); - - cy.get('button') - .contains(/^Submit$/) - .click(); - - cy.wait(2000); - cy.get('#tag-1 > span').contains('complete'); - } +//Check if the process instance is completed successfully +const checkProcessInstanceCompleted = ( + username, + password, + processInstanceId +) => { + cy.wait(2000); + cy.log('========Login with : ', username); + cy.log('========processInstanceId: ', processInstanceId); + cy.login(username, password); + + cy.wait(1000); + cy.visit('/admin/process-instances/find-by-id'); + cy.get('#process-instance-id-input').type(processInstanceId); + + cy.get('button') + .contains(/^Submit$/) + .click(); + + cy.wait(2000); + cy.get('#tag-1 > span').contains('complete'); +} // Software and Licenses Path - Without Files -describe.only('Software and Licenses Path - Without Files', () => { +describe('Software and Licenses Path - Without Files', () => { Cypress._.times(1, () => { // Everyone approves with CP it('Everyone approves with CP', () => { @@ -205,11 +206,12 @@ describe.only('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -329,7 +331,7 @@ describe.only('Software and Licenses Path - Without Files', () => { ); cy.get('#root_item_1_qty').clear().type('1'); cy.get('#root_item_1_currency_type').select('Fiat'); - cy.get('#root_item_1_currency').select('STN'); + cy.get('#root_item_1_currency').select('COP'); cy.get('#root_item_1_unit_price').type('380'); cy.get('button') @@ -355,11 +357,12 @@ describe.only('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -421,7 +424,7 @@ describe.only('Software and Licenses Path - Without Files', () => { }); // Budget owner rejects the request - it.only('Budget owner rejects', () => { + it('Budget owner rejects', () => { const username = Cypress.env('requestor_username'); const password = Cypress.env('requestor_password'); cy.log(`=====username : ${username}`); @@ -510,7 +513,7 @@ describe.only('Software and Licenses Path - Without Files', () => { .contains(/^Return to Home$/) .click(); - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -616,11 +619,12 @@ describe.only('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -765,11 +769,12 @@ describe.only('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -825,7 +830,7 @@ describe.only('Software and Licenses Path - Without Files', () => { }); // Software and Licenses Path - Without Files and with only mandatory fields -describe('Software and Licenses Path - Without Files and with only mandatory fields', () => { +describe.only('Software and Licenses Path - Without Files and with only mandatory fields', () => { Cypress._.times(1, () => { // Everyone approves with CP it('Everyone approves with CP', () => { @@ -901,11 +906,12 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -1024,11 +1030,12 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -1163,11 +1170,12 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -1261,11 +1269,12 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -1398,11 +1407,12 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.get('button') + cy.wait(6000); + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -1612,11 +1622,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1801,11 +1811,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2006,11 +2016,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2171,11 +2181,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2299,7 +2309,7 @@ describe('Software and Licenses Path - With Files', () => { ); cy.get('#root_item_0_qty').clear().type('2'); cy.get('#root_item_0_currency_type').select('Fiat'); - cy.get('#root_item_0_currency').select('STN'); + cy.get('#root_item_0_currency').select('COP'); cy.get('#root_item_0_unit_price').type('2416'); cy.get('button') @@ -2376,11 +2386,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2610,11 +2620,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2830,11 +2840,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -3067,11 +3077,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -3262,11 +3272,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username'); @@ -3371,12 +3381,12 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { cy.get('body').click(); cy.get('#root_vendor').clear().type('Atlassian'); cy.get('#root_payment_method').select('Debit Card'); - /*cy.get('button') - .contains(/^Submit$/) - .click(); - - - cy.contains('Task: Enter NDR Items', { timeout: 60000 });*/ + /* cy.get('button') + .contains(/^Submit$/) + .click(); + + + cy.contains('Task: Enter NDR Items', { timeout: 60000 });*/ // item 0 cy.get('#root_item_0_sub_category').select('op_src'); cy.get('#root_item_0_item_name') @@ -3386,7 +3396,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { ); cy.get('#root_item_0_qty').clear().type('2'); cy.get('#root_item_0_currency_type').select('Fiat'); - cy.get('#root_item_0_currency').select('THB'); + cy.get('#root_item_0_currency').select('GBP'); cy.get('#root_item_0_unit_price').type('1350'); cy.get('#root_item > div:nth-child(3) > p > button').click(); @@ -3400,7 +3410,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { ); cy.get('#root_item_1_qty').clear().type('15'); cy.get('#root_item_1_currency_type').select('Fiat'); - cy.get('#root_item_1_currency').select('TRY'); + cy.get('#root_item_1_currency').select('SGD'); cy.get('#root_item_1_unit_price').type('3200'); cy.get('#root_item > div:nth-child(3) > p > button').click(); @@ -3491,11 +3501,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); cy.wait(9000); - cy.get('button') + /*cy.get('button') .contains(/^Return to Home$/) - .click(); + .click();*/ - cy.contains('Started by me', { timeout: 60000 }); + cy.contains('Process Instance Id:', { timeout: 60000 }); cy.logout(); const budgetOwnerUsername = Cypress.env('budgetowner_username');