From 2fefe4e4de01c92090cfb2c60ebab3f227beae64 Mon Sep 17 00:00:00 2001 From: Madhurya Liyanage Date: Fri, 28 Apr 2023 15:25:04 +0530 Subject: [PATCH] Updates to match the interstitial pages --- .../pilot/NDR_PP1/consultingfees.cy.js | 49 ++++-- .../cypress/pilot/NDR_PP1/equipment.cy.js | 144 ++++++++++----- .../pilot/NDR_PP1/learninganddev.cy.js | 96 ++++++---- .../cypress/pilot/NDR_PP1/otherfees.cy.js | 60 ++++--- .../pilot/NDR_PP1/softwarelicense.cy.js | 164 ++++++++++++------ 5 files changed, 346 insertions(+), 167 deletions(-) diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js index f6900d391..90a7c1449 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js @@ -120,8 +120,8 @@ describe('Consulting Fees Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -191,7 +191,10 @@ describe('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.wait(3000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -246,8 +249,8 @@ describe('Consulting Fees Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -317,7 +320,10 @@ describe('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.wait(3000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -372,8 +378,8 @@ describe('Consulting Fees Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -444,7 +450,10 @@ describe('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.wait(3000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -523,8 +532,8 @@ describe('Consulting Fees Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -636,7 +645,7 @@ describe('Consulting Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); + cy.wait(9000); cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -691,8 +700,8 @@ describe('Consulting Fees Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -804,8 +813,10 @@ describe('Consulting Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -860,8 +871,8 @@ describe('Consulting Fees Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -971,7 +982,7 @@ describe('Consulting Fees Path - With Files', () => { cy.get('button') .contains(/^Submit$/) .click(); - cy.wait(6000); + cy.wait(9000); cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js index b70f94abc..a4f8ef3c7 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js @@ -124,7 +124,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -206,7 +206,10 @@ describe('Equipment Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -276,7 +279,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -328,7 +331,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -396,7 +402,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -446,7 +452,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -541,7 +550,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -592,7 +601,10 @@ describe('Equipment Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -646,7 +658,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -697,7 +709,10 @@ describe('Equipment Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -751,7 +766,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -802,7 +817,10 @@ describe('Equipment Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -874,7 +892,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -925,7 +943,10 @@ describe('Equipment Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -993,7 +1014,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1043,7 +1064,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1111,7 +1135,7 @@ describe('Equipment Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1161,7 +1185,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1254,7 +1281,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1376,8 +1403,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1445,7 +1475,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1536,8 +1566,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1605,7 +1638,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1695,8 +1728,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1791,7 +1827,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1883,8 +1919,11 @@ describe('Equipment Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1938,7 +1977,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2030,8 +2069,11 @@ describe('Equipment Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2085,7 +2127,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2176,8 +2218,11 @@ describe('Equipment Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2249,7 +2294,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2340,8 +2385,11 @@ describe('Equipment Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2409,7 +2457,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2499,8 +2547,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2568,7 +2619,7 @@ describe('Equipment Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2659,8 +2710,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(20000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js index 911a0023e..a794344de 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js @@ -120,7 +120,7 @@ describe('Learning and Development Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -171,7 +171,10 @@ describe('Learning and Development Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -225,7 +228,7 @@ describe('Learning and Development Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -275,7 +278,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -329,7 +335,7 @@ describe('Learning and Development Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -379,7 +385,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -452,7 +461,7 @@ describe('Learning and Development Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -525,7 +534,10 @@ describe('Learning and Development Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -592,7 +604,7 @@ describe('Learning and Development Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -642,7 +654,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -696,7 +711,7 @@ describe('Learning and Development Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -746,7 +761,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -827,7 +845,7 @@ describe('Learning and Development Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -919,8 +937,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -974,7 +995,7 @@ describe('Learning and Development Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1066,8 +1087,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1121,7 +1145,7 @@ describe('Learning and Development Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1212,8 +1236,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1286,7 +1313,7 @@ describe('Learning and Development Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1400,8 +1427,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1468,7 +1498,7 @@ describe('Learning and Development Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1560,8 +1590,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1615,7 +1648,7 @@ describe('Learning and Development Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1707,8 +1740,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { 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 7e4410a83..4375b39c0 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js @@ -120,8 +120,8 @@ describe('Other Fees Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -183,7 +183,10 @@ describe('Other Fees Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -237,8 +240,8 @@ describe('Other Fees Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -287,7 +290,10 @@ describe('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -341,8 +347,8 @@ describe('Other Fees Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -391,7 +397,10 @@ describe('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -469,8 +478,8 @@ describe('Other Fees Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -571,8 +580,11 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -626,8 +638,8 @@ describe('Other Fees Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -718,8 +730,11 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -773,8 +788,8 @@ describe('Other Fees Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); - cy.url().then((currentUrl) => { + cy.wait(5000); + cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks const processInstanceId = currentUrl.match(/(?<=\/tasks\/)\d+/)[0]; @@ -865,8 +880,11 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { 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 980d23989..c8f041432 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js @@ -125,7 +125,7 @@ describe('Software and Licenses Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -188,7 +188,10 @@ describe('Software and Licenses Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -267,7 +270,7 @@ describe('Software and Licenses Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -330,7 +333,10 @@ describe('Software and Licenses Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -425,7 +431,7 @@ describe('Software and Licenses Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -475,7 +481,10 @@ describe('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -529,7 +538,7 @@ describe('Software and Licenses Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -579,7 +588,10 @@ describe('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -673,7 +685,7 @@ describe('Software and Licenses Path - Without Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -724,7 +736,10 @@ describe('Software and Licenses Path - Without Files', () => { .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -788,7 +803,7 @@ describe('Software and Licenses Path - With Files', () => { Cypress._.times(1, () => { //Everyone approves with CP - it('Everyone approves with CP', () => { + it.only('Everyone approves with CP', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -820,7 +835,7 @@ describe('Software and Licenses Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -924,8 +939,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1004,7 +1022,7 @@ describe('Software and Licenses Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1097,8 +1115,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1193,7 +1214,7 @@ describe('Software and Licenses Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1285,8 +1306,11 @@ describe('Software and Licenses Path - With Files', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1308,7 +1332,7 @@ describe('Software and Licenses Path - With Files', () => { }); //Budget owner request for additional details - it.only('Budget owner need more info', () => { + it('Budget owner need more info', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1340,7 +1364,7 @@ describe('Software and Licenses Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1432,7 +1456,10 @@ describe('Software and Licenses Path - With Files', () => { .click(); cy.wait(9000); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1527,7 +1554,7 @@ describe('Software and Licenses Path - With Files', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1620,8 +1647,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1716,7 +1746,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1832,8 +1862,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -1912,7 +1945,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2027,8 +2060,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2123,7 +2159,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2236,8 +2272,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2291,7 +2330,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2404,8 +2443,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .contains(/^Submit$/) .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2500,7 +2542,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2614,8 +2656,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); - cy.wait(6000); - cy.visit('/'); + cy.wait(9000); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2673,7 +2718,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { }); //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, () => { @@ -2710,7 +2755,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2760,7 +2805,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2839,7 +2887,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2889,7 +2937,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -2984,7 +3035,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -3034,7 +3085,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -3088,7 +3142,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -3138,7 +3192,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000); @@ -3232,7 +3289,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi { timeout: 60000 } ); - cy.wait(15000); + cy.wait(5000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -3283,7 +3340,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .click(); - cy.visit('/'); + cy.get('button') + .contains(/^Return to Home$/) + .click(); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(2000);