From 66786755f5baef5909e88716ed5bde646b61311f Mon Sep 17 00:00:00 2001 From: Madhurya Liyanage Date: Wed, 26 Apr 2023 19:54:30 +0530 Subject: [PATCH] Updates related to the new UI changes --- .../pilot/NDR_PP1/consultingfees.cy.js | 63 ++++-- .../cypress/pilot/NDR_PP1/equipment.cy.js | 184 ++++++++++------ .../pilot/NDR_PP1/learninganddev.cy.js | 126 +++++++---- .../cypress/pilot/NDR_PP1/otherfees.cy.js | 58 +++-- .../pilot/NDR_PP1/softwarelicense.cy.js | 206 +++++++++++------- 5 files changed, 404 insertions(+), 233 deletions(-) diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js index a84033bce..f6900d391 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/consultingfees.cy.js @@ -19,6 +19,7 @@ const submitWithUser = ( .contains(/^Submit$/) .click(); + cy.wait(2000); cy.contains('Tasks I can complete', { timeout: 60000 }); cy.get('.cds--btn').contains(/^Go$/).click(); @@ -36,18 +37,18 @@ const submitWithUser = ( cy.get('.cds--text-area__wrapper').find('#root').type(username.concat(' needs additional info. A software license is a document that provides legally binding guidelines for the use and distribution of software.Software licenses typically provide end users with the right to END.')); } else if (approvaltype === "providemoreinfo") { //Form 1 - cy.contains('Task: Submit New Demand Request Details', { timeout: 60000 }); + cy.contains('Task: Submit Details', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) .click(); //Form 2 - cy.contains('Task: Enter NDR Items', { timeout: 60000 }); + /*cy.contains('Task: Enter NDR Items', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) - .click(); + .click();*/ //Form 3 cy.contains( - 'Review and provide any supporting information or files for your request.', + 'Task: Review the Request', { timeout: 60000 }); cy.get('.cds--text-area__wrapper').find('#root').clear().type('Providing additional info. It\’s free and easy to post a job. Simply fill in a title, description and budget and competitive bids come within minutes. No job is too big or too small. We\'ve got people for jobs of any size.'); @@ -72,8 +73,11 @@ const submitWithUser = ( .click(); } + + cy.visit('/'); + cy.location({ timeout: 60000 }).should((loc) => { - expect(loc.pathname).to.eq('/tasks'); + expect(loc.pathname).to.eq('/'); }); cy.wait(2000); cy.logout(); @@ -84,7 +88,7 @@ const submitWithUser = ( describe('Consulting Fees Path - Without Files', () => { Cypress._.times(1, () => { //Budget owner approves the request - it.only('Budget owner approves', () => { + it('Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -94,7 +98,7 @@ describe('Consulting Fees Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -112,13 +116,15 @@ describe('Consulting Fees Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); 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]; cy.log('==###############===processInstanceId : ', processInstanceId); let projectId = Cypress.env('project_id'); @@ -185,6 +191,7 @@ describe('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); @@ -217,7 +224,7 @@ describe('Consulting Fees Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -235,10 +242,11 @@ describe('Consulting Fees Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -309,6 +317,8 @@ describe('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -340,7 +350,7 @@ describe('Consulting Fees Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -358,10 +368,11 @@ describe('Consulting Fees Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -433,6 +444,8 @@ describe('Consulting Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -478,7 +491,7 @@ describe('Consulting Fees Path - Without Files', () => { describe('Consulting Fees Path - With Files', () => { Cypress._.times(1, () => { //Budget owner approves the request - it.only('Budget owner approves', () => { + it('Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -488,7 +501,7 @@ describe('Consulting Fees Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -506,10 +519,11 @@ describe('Consulting Fees Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -622,7 +636,8 @@ describe('Consulting Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -654,7 +669,7 @@ describe('Consulting Fees Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -672,10 +687,11 @@ describe('Consulting Fees Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -788,6 +804,9 @@ describe('Consulting Fees Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); + cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -819,7 +838,7 @@ describe('Consulting Fees Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -837,10 +856,11 @@ describe('Consulting Fees Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -951,7 +971,8 @@ describe('Consulting Fees Path - With Files', () => { cy.get('button') .contains(/^Submit$/) .click(); - + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { 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 318c83b65..b70f94abc 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/equipment.cy.js @@ -19,6 +19,7 @@ const submitWithUser = ( .contains(/^Submit$/) .click(); + cy.wait(2000); cy.contains('Tasks I can complete', { timeout: 60000 }); cy.get('.cds--btn').contains(/^Go$/).click(); @@ -40,18 +41,18 @@ const submitWithUser = ( cy.get('.cds--text-area__wrapper').find('#root').type(username.concat(' is escalating to Budget owner.')); } else if (approvaltype === "providemoreinfo") { //Form 1 - cy.contains('Task: Submit New Demand Request Details', { timeout: 60000 }); + cy.contains('Task: Submit Details', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) .click(); //Form 2 - cy.contains('Task: Enter NDR Items', { timeout: 60000 }); - cy.get('button') - .contains(/^Submit$/) - .click(); + /* cy.contains('Task: Enter NDR Items', { timeout: 60000 }); + cy.get('button') + .contains(/^Submit$/) + .click();*/ //Form 3 cy.contains( - 'Review and provide any supporting information or files for your request.', + 'Task: Review the Request', { timeout: 60000 }); cy.get('.cds--text-area__wrapper').find('#root').clear().type('Providing additional info. Computer hardware includes the physical parts of a computer, such as the case, central processing unit (CPU), random access memory (RAM), monitor, mouse, keyboard, computer data storage, graphics card, sound card'); @@ -75,8 +76,11 @@ const submitWithUser = ( .click(); } + + cy.visit('/'); + cy.location({ timeout: 60000 }).should((loc) => { - expect(loc.pathname).to.eq('/tasks'); + expect(loc.pathname).to.eq('/'); }); cy.wait(2000); cy.logout(); @@ -88,7 +92,7 @@ describe('Equipment Path - Without Files', () => { Cypress._.times(1, () => { //Out of Policy. People Ops Partner Group and Budget owner approves the request - it.only('Out of Policy. People Ops Partner Group and Budget owner approves', () => { + it('Out of Policy. People Ops Partner Group and Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -98,7 +102,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -116,10 +120,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -201,9 +206,10 @@ describe('Equipment Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); cy.log('=====after logout ---'); @@ -248,7 +254,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -266,10 +272,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -321,9 +328,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -366,7 +374,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -384,10 +392,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -437,9 +446,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -499,7 +509,7 @@ describe('Equipment Path - Without Files', () => { }); //Within Policy. People Ops Partner Group approves the request - it.only('Within Policy. People Ops Partner Group approves', () => { + it('Within Policy. People Ops Partner Group approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -509,7 +519,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -527,10 +537,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -581,9 +592,10 @@ describe('Equipment Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -612,7 +624,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -630,10 +642,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -684,9 +697,10 @@ describe('Equipment Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -715,7 +729,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -733,10 +747,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -787,9 +802,10 @@ describe('Equipment Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -826,7 +842,7 @@ describe('Equipment Path - Without Files', () => { }); }); //Within Policy. People Ops Partner Group and Budget owner approves the request - it.only('Within Policy. People Ops Partner Group and Budget owner approves', () => { + it('Within Policy. People Ops Partner Group and Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -836,7 +852,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -854,10 +870,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -908,9 +925,10 @@ describe('Equipment Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -953,7 +971,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -971,10 +989,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1024,9 +1043,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1069,7 +1089,7 @@ describe('Equipment Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1087,10 +1107,11 @@ describe('Equipment Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1140,9 +1161,10 @@ describe('Equipment Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1200,7 +1222,7 @@ describe('Equipment Path - With Files', () => { Cypress._.times(1, () => { //Out of Policy. People Ops Partner Group and Budget owner approves the request - it.only('Out of Policy. People Ops Partner Group and Budget owner approves', () => { + it('Out of Policy. People Ops Partner Group and Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1210,7 +1232,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1228,10 +1250,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1353,10 +1376,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); - + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1399,7 +1423,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1417,10 +1441,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1511,9 +1536,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1556,7 +1583,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1574,10 +1601,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1667,9 +1695,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1729,7 +1759,7 @@ describe('Equipment Path - With Files', () => { }); //Within Policy. People Ops Partner Group approves the request - it.only('Within Policy. People Ops Partner Group approves', () => { + it('Within Policy. People Ops Partner Group approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1739,7 +1769,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1757,10 +1787,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1852,9 +1883,11 @@ describe('Equipment Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1883,7 +1916,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1901,10 +1934,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1996,9 +2030,11 @@ describe('Equipment Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -2027,7 +2063,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2045,10 +2081,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2139,9 +2176,11 @@ describe('Equipment Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -2178,7 +2217,7 @@ describe('Equipment Path - With Files', () => { }); }); //Within Policy. People Ops Partner Group and Budget owner approves the request - it.only('Within Policy. People Ops Partner Group and Budget owner approves', () => { + it('Within Policy. People Ops Partner Group and Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -2188,7 +2227,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2206,10 +2245,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2300,9 +2340,11 @@ describe('Equipment Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -2345,7 +2387,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2363,10 +2405,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2456,9 +2499,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -2501,7 +2546,7 @@ describe('Equipment Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2519,10 +2564,11 @@ describe('Equipment Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2613,9 +2659,11 @@ describe('Equipment Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js index 4f2da4163..911a0023e 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/learninganddev.cy.js @@ -19,6 +19,7 @@ const submitWithUser = ( .contains(/^Submit$/) .click(); + cy.wait(2000); cy.contains('Tasks I can complete', { timeout: 60000 }); cy.get('.cds--btn').contains(/^Go$/).click(); @@ -36,18 +37,18 @@ const submitWithUser = ( cy.get('.cds--text-area__wrapper').find('#root').type(username.concat(' needs additional info. The term, learning and development, encompasses any professional development a business provides to its employees END.')); } else if (approvaltype === "providemoreinfo") { //Form 1 - cy.contains('Task: Submit New Demand Request Details', { timeout: 60000 }); + cy.contains('Task: Submit Details', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) .click(); //Form 2 - cy.contains('Task: Enter NDR Items', { timeout: 60000 }); + /*cy.contains('Task: Enter NDR Items', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) - .click(); + .click();*/ //Form 3 cy.contains( - 'Review and provide any supporting information or files for your request.', + 'Task: Review the Request', { timeout: 60000 }); cy.get('.cds--text-area__wrapper').find('#root').clear().type('Providing additional info. Learning and development (L&D) is a function within an organization that is responsible for empowering employees\’ growth and developing their knowledge, skills, and capabilities to drive better business performance.'); @@ -71,8 +72,11 @@ const submitWithUser = ( .click(); } + + cy.visit('/'); + cy.location({ timeout: 60000 }).should((loc) => { - expect(loc.pathname).to.eq('/tasks'); + expect(loc.pathname).to.eq('/'); }); cy.wait(2000); cy.logout(); @@ -84,7 +88,7 @@ describe('Learning and Development Path - Without Files', () => { Cypress._.times(1, () => { //People Ops Partner Group approves the request - it.only('Books Only. People Ops Partner Group approves', () => { + it('Books Only. People Ops Partner Group approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -94,7 +98,7 @@ describe('Learning and Development Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -112,10 +116,11 @@ describe('Learning and Development Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -166,9 +171,10 @@ describe('Learning and Development Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -197,7 +203,7 @@ describe('Learning and Development Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -215,10 +221,11 @@ describe('Learning and Development Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -268,9 +275,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -299,7 +307,7 @@ describe('Learning and Development Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -317,10 +325,11 @@ describe('Learning and Development Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -370,9 +379,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -410,7 +420,7 @@ describe('Learning and Development Path - Without Files', () => { }); //Budget owner approves and People Ops Partner Group approves the request - it.only('NOT Books Only. Budget owner approves and People Ops Partner Group approves', () => { + it('NOT Books Only. Budget owner approves and People Ops Partner Group approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -420,7 +430,7 @@ describe('Learning and Development Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -438,10 +448,11 @@ describe('Learning and Development Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -514,9 +525,10 @@ describe('Learning and Development Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -558,7 +570,7 @@ describe('Learning and Development Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -576,10 +588,11 @@ describe('Learning and Development Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -629,9 +642,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -660,7 +674,7 @@ describe('Learning and Development Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -678,10 +692,11 @@ describe('Learning and Development Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -731,9 +746,10 @@ describe('Learning and Development Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -779,7 +795,7 @@ describe('Learning and Development Path - With Files', () => { Cypress._.times(1, () => { //People Ops Partner Group approves the request - it.only('Books Only. People Ops Partner Group approves', () => { + it('Books Only. People Ops Partner Group approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -789,7 +805,7 @@ describe('Learning and Development Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -807,10 +823,11 @@ describe('Learning and Development Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -902,10 +919,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -934,7 +952,7 @@ describe('Learning and Development Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -952,10 +970,11 @@ describe('Learning and Development Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1047,9 +1066,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1078,7 +1099,7 @@ describe('Learning and Development Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1096,10 +1117,11 @@ describe('Learning and Development Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1190,9 +1212,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1230,7 +1254,7 @@ describe('Learning and Development Path - With Files', () => { }); //Budget owner approves and People Ops Partner Group approves the request - it.only('NOT Books Only. Budget owner approves and People Ops Partner Group approves', () => { + it('NOT Books Only. Budget owner approves and People Ops Partner Group approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1240,7 +1264,7 @@ describe('Learning and Development Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1258,10 +1282,11 @@ describe('Learning and Development Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1375,10 +1400,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); - + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let peopleOpsUsername = Cypress.env('peopleopssme_username'); let peopleOpsPassword = Cypress.env('peopleopssme_password'); @@ -1420,7 +1446,7 @@ describe('Learning and Development Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1438,10 +1464,11 @@ describe('Learning and Development Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1533,9 +1560,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -1564,7 +1593,7 @@ describe('Learning and Development Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1582,10 +1611,11 @@ describe('Learning and Development Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1677,9 +1707,11 @@ describe('Learning and Development Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); diff --git a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js index f177b9092..7e4410a83 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/otherfees.cy.js @@ -19,6 +19,7 @@ const submitWithUser = ( .contains(/^Submit$/) .click(); + cy.wait(2000); cy.contains('Tasks I can complete', { timeout: 60000 }); cy.get('.cds--btn').contains(/^Go$/).click(); @@ -36,18 +37,18 @@ const submitWithUser = ( cy.get('.cds--text-area__wrapper').find('#root').type(username.concat(' needs additional info. Coworking is not only about providing a physical place, but also about establishing a community. Its rapid growth has been seen as a possible way for city planners to address.')); } else if (approvaltype === "providemoreinfo") { //Form 1 - cy.contains('Task: Submit New Demand Request Details', { timeout: 60000 }); + cy.contains('Task: Submit Details', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) .click(); //Form 2 - cy.contains('Task: Enter NDR Items', { timeout: 60000 }); + /*cy.contains('Task: Enter NDR Items', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) - .click(); + .click();*/ //Form 3 cy.contains( - 'Review and provide any supporting information or files for your request.', + 'Task: Review the Request', { timeout: 60000 }); cy.get('.cds--text-area__wrapper').find('#root').clear().type('Providing additional info. Coworking tends to fall into two sides: Those that are real-estate-centric (all about selling desks and offices first) while others are community-centric (focused on building community that happens to also have offices)'); @@ -72,8 +73,11 @@ const submitWithUser = ( .click(); } + + cy.visit('/'); + cy.location({ timeout: 60000 }).should((loc) => { - expect(loc.pathname).to.eq('/tasks'); + expect(loc.pathname).to.eq('/'); }); cy.wait(2000); cy.logout(); @@ -84,7 +88,7 @@ describe('Other Fees Path - Without Files', () => { Cypress._.times(1, () => { //Budget owner approves the request - it.only('Budget owner approves', () => { + it('Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -94,7 +98,7 @@ describe('Other Fees Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -112,10 +116,11 @@ describe('Other Fees Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -178,6 +183,7 @@ describe('Other Fees Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -209,7 +215,7 @@ describe('Other Fees Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -227,10 +233,11 @@ describe('Other Fees Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -280,6 +287,7 @@ describe('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -311,7 +319,7 @@ describe('Other Fees Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -329,10 +337,11 @@ describe('Other Fees Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -382,6 +391,7 @@ describe('Other Fees Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -427,7 +437,7 @@ describe('Other Fees Path - With Files', () => { Cypress._.times(1, () => { //Budget owner approves the request - it.only('Budget owner approves', () => { + it('Budget owner approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -437,7 +447,7 @@ describe('Other Fees Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -455,10 +465,11 @@ describe('Other Fees Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -560,7 +571,8 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); - + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -592,7 +604,7 @@ describe('Other Fees Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -610,10 +622,11 @@ describe('Other Fees Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -705,6 +718,8 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); cy.wait(1000); @@ -736,7 +751,7 @@ describe('Other Fees Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -754,10 +769,11 @@ describe('Other Fees Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -849,6 +865,8 @@ describe('Other Fees Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); 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 146d1663a..980d23989 100644 --- a/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js +++ b/spiffworkflow-frontend/cypress/pilot/NDR_PP1/softwarelicense.cy.js @@ -14,11 +14,12 @@ const submitWithUser = ( cy.log('=======visit find by id : '); cy.visit('/admin/process-instances/find-by-id'); cy.get('#process-instance-id-input').type(processInstanceId); - + cy.wait(1000); cy.get('button') .contains(/^Submit$/) .click(); + cy.wait(2000); cy.contains('Tasks I can complete', { timeout: 60000 }); cy.get('.cds--btn').contains(/^Go$/).click(); @@ -40,18 +41,18 @@ const submitWithUser = ( cy.get('.cds--text-area__wrapper').find('#root').type(username.concat(' is selecting CP is Approved.')); } else if (approvaltype === "providemoreinfo") { //Form 1 - cy.contains('Task: Submit New Demand Request Details', { timeout: 60000 }); + cy.contains('Task: Submit Details', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) .click(); //Form 2 - cy.contains('Task: Enter NDR Items', { timeout: 60000 }); + /*cy.contains('Task: Enter NDR Items', { timeout: 60000 }); cy.get('button') .contains(/^Submit$/) - .click(); + .click();*/ //Form 3 cy.contains( - 'Review and provide any supporting information or files for your request.', + 'Task: Review the Request', { timeout: 60000 }); cy.get('.cds--text-area__wrapper').find('#root').clear().type('Providing additional info. Open source is a term that originally referred to open source software (OSS). Open source software is code that is designed to be publicly accessible—anyone can see, modify, and distribute.'); @@ -75,8 +76,11 @@ const submitWithUser = ( .click(); } + + cy.visit('/'); + cy.location({ timeout: 60000 }).should((loc) => { - expect(loc.pathname).to.eq('/tasks'); + expect(loc.pathname).to.eq('/'); }); cy.wait(2000); cy.logout(); @@ -89,7 +93,7 @@ describe('Software and Licenses Path - Without Files', () => { Cypress._.times(1, () => { //Everyone approves with CP - it.only('Everyone approves with CP', () => { + it('Everyone approves with CP', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -99,7 +103,7 @@ describe('Software and Licenses Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -117,10 +121,11 @@ describe('Software and Licenses Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -183,9 +188,10 @@ describe('Software and Licenses Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -229,7 +235,7 @@ describe('Software and Licenses Path - Without Files', () => { }); //Everyone approves the request - it.only('Everyone approves', () => { + it('Everyone approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -239,7 +245,7 @@ describe('Software and Licenses Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -257,10 +263,11 @@ describe('Software and Licenses Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -323,9 +330,10 @@ describe('Software and Licenses Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -395,7 +403,7 @@ describe('Software and Licenses Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -413,10 +421,11 @@ describe('Software and Licenses Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -466,9 +475,10 @@ describe('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -497,7 +507,7 @@ describe('Software and Licenses Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -515,10 +525,11 @@ describe('Software and Licenses Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -568,9 +579,10 @@ describe('Software and Licenses Path - Without Files', () => { .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -639,7 +651,7 @@ describe('Software and Licenses Path - Without Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -657,10 +669,11 @@ describe('Software and Licenses Path - Without Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -711,9 +724,10 @@ describe('Software and Licenses Path - Without Files', () => { .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -774,7 +788,7 @@ describe('Software and Licenses Path - With Files', () => { Cypress._.times(1, () => { //Everyone approves with CP - it.only('Everyone approves with CP', () => { + it('Everyone approves with CP', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -784,7 +798,7 @@ describe('Software and Licenses Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -802,10 +816,11 @@ describe('Software and Licenses Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -909,9 +924,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -955,7 +972,7 @@ describe('Software and Licenses Path - With Files', () => { }); //Everyone approves the request - it.only('Everyone approves', () => { + it('Everyone approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -965,7 +982,7 @@ describe('Software and Licenses Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -983,10 +1000,11 @@ describe('Software and Licenses Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1079,9 +1097,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -1151,7 +1171,7 @@ describe('Software and Licenses Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1169,10 +1189,11 @@ describe('Software and Licenses Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1264,9 +1285,11 @@ describe('Software and Licenses Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -1285,7 +1308,7 @@ describe('Software and Licenses Path - With Files', () => { }); //Budget owner request for additional details - it('Budget owner need more info', () => { + it.only('Budget owner need more info', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1295,7 +1318,7 @@ describe('Software and Licenses Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1313,10 +1336,11 @@ describe('Software and Licenses Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1407,9 +1431,11 @@ describe('Software and Licenses Path - With Files', () => { .contains(/^Submit$/) .click(); + cy.wait(9000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -1479,7 +1505,7 @@ describe('Software and Licenses Path - With Files', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1497,10 +1523,11 @@ describe('Software and Licenses Path - With Files', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1593,9 +1620,11 @@ describe('Software and Licenses Path - With Files', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -1655,7 +1684,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { Cypress._.times(1, () => { //Everyone approves with CP - it.only('Everyone approves with CP', () => { + it('Everyone approves with CP', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1665,7 +1694,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1683,10 +1712,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1802,9 +1832,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -1848,7 +1880,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { }); //Everyone approves the request - it.only('Everyone approves', () => { + it('Everyone approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -1858,7 +1890,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -1876,10 +1908,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -1994,9 +2027,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -2066,7 +2101,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2084,10 +2119,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2200,9 +2236,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -2231,7 +2269,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2249,10 +2287,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2365,9 +2404,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .contains(/^Submit$/) .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -2437,7 +2478,7 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2455,10 +2496,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2572,9 +2614,11 @@ describe('Software and Licenses Path - With Files and Multiple items', () => { .click(); + cy.wait(6000); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -2634,7 +2678,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi Cypress._.times(1, () => { //Everyone approves with CP - it.only('Everyone approves with CP', () => { + it('Everyone approves with CP', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -2644,7 +2688,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2662,10 +2706,11 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2715,10 +2760,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -2762,7 +2807,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi }); //Everyone approves the request - it.only('Everyone approves', () => { + it('Everyone approves', () => { let username = Cypress.env('requestor_username'); let password = Cypress.env('requestor_password'); cy.log('=====username : ' + username); @@ -2772,7 +2817,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2790,10 +2835,11 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2843,10 +2889,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); - + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -2916,7 +2962,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -2934,10 +2980,11 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -2987,9 +3034,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -3018,7 +3066,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -3036,10 +3084,11 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -3089,9 +3138,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .contains(/^Submit$/) .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password'); @@ -3160,7 +3210,7 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi cy.visit('/'); cy.contains('Start New +').click(); - cy.contains('Request Goods/Services'); + cy.contains('Request Goods or Services'); cy.runPrimaryBpmnFile(true); @@ -3178,10 +3228,11 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi */ cy.contains( - 'Request Goods/Services', + 'Request Goods or Services', { timeout: 60000 } ); + cy.wait(15000); cy.url().then((currentUrl) => { // if url is "/tasks/8/d37c2f0f-016a-4066-b669-e0925b759560" // extract the digits after /tasks @@ -3232,9 +3283,10 @@ describe('Software and Licenses Path - Without Files and with only mandatory fi .click(); + cy.visit('/'); cy.contains('Started by me', { timeout: 60000 }); cy.logout(); - cy.wait(1000); + cy.wait(2000); let budgetOwnerUsername = Cypress.env('budgetowner_username'); let budgetOwnerPassword = Cypress.env('budgetowner_password');