From a4d76aed4b39adf439c23d76120bb341a551e05f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 1 Nov 2021 23:19:24 +0000 Subject: [PATCH] --- .../accounting-user/accounting-features.js | 57 +++++++++++++------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/e2e/tests/regression/accounting-user/accounting-features.js b/e2e/tests/regression/accounting-user/accounting-features.js index 291675c..f325fda 100644 --- a/e2e/tests/regression/accounting-user/accounting-features.js +++ b/e2e/tests/regression/accounting-user/accounting-features.js @@ -6,8 +6,8 @@ describe("When Accounting user logs in", () => { const dToday = `${dNow.getFullYear()}-${(dNow.getMonth() + 1) .toString() .padStart(2, "0")}-${dNow.getDate().toString().padStart(2, "0")}`; - const tNow = `${dNow.getHours()}:${dNow.getMinutes()}`; - const tOneHourFromNow = `${dNow.getHours() + 1}:${dNow.getMinutes()}`; + const tNow = `${dNow.getHours().toString().padStart(2, "0")}:${dNow.getMinutes().toString().padStart(2, "0")}`; + const tOneHourFromNow = `${(dNow.getHours() + 1).toString().padStart(2, "0")}:${dNow.getMinutes().toString().padStart(2, "0")}`; cy.visit("/login"); @@ -30,7 +30,7 @@ describe("When Accounting user logs in", () => { cy.url().should("include", "/home-user-settings"); cy.get("[data-cy='nativeDateTimeInput']").check({ force: true }); - /* + //DASHBOARD @@ -125,7 +125,7 @@ describe("When Accounting user logs in", () => { cy.get("[data-cy=navicon]").click(); cy.get("[data-cy='nav/home-notify-subscriptions']").click(); cy.url().should("include", "/home-notify-subscriptions"); - cy.get("[data-cy='notify-subscriptions:new']").click(); + cy.get("[data-cy='notify-subscriptions:new']:first").click(); cy.url().should("include", "/home-notify-subscriptions/0"); cy.chooseVSelect("eventType", "Object created"); cy.chooseVSelect("ayaType", "Contract"); @@ -137,7 +137,7 @@ describe("When Accounting user logs in", () => { cy.contains("Object created"); cy.contains("Contract"); cy.contains("Deliver in application"); -*/ + //CONTRACT cy.get("[data-cy=navicon]").click(); @@ -145,17 +145,15 @@ describe("When Accounting user logs in", () => { cy.get("[data-cy='nav/svc-contracts']").click(); cy.url().should("include", "/svc-contracts"); cy.get("[data-cy=contractsTable]"); - cy.get("[data-cy='contract-list:new']").click(); + cy.get("[data-cy='contract-list:new']:first").click(); cy.get("[data-cy=name]").type( `${Cypress.config("cyid")}-test-contract{enter}` ); - cy.get("[data-cy='responseTime:days']").type('7'); - cy.get("[data-cy='partsOverridePct']").type('2'); - cy.get("[data-cy='serviceRatesOverridePct']").type('3'); - cy.get("[data-cy='travelRatesOverridePct']").type('4'); - cy.get("[data-cy=notes]").type( - `Test contract NOTES!!!{enter}eot{enter}` - ); + cy.get("[data-cy='responseTime:days']").type("7"); + cy.get("[data-cy='partsOverridePct']").type("2"); + cy.get("[data-cy='serviceRatesOverridePct']").type("3"); + cy.get("[data-cy='travelRatesOverridePct']").type("4"); + cy.get("[data-cy=notes]").type(`Test contract NOTES!!!{enter}eot{enter}`); cy.get("[data-cy=alertNotes]").type( `Test contract alert message{enter}eot{enter}` ); @@ -163,7 +161,34 @@ describe("When Accounting user logs in", () => { cy.get("[data-cy=navicon]").click(); cy.get("[data-cy='nav/svc-contracts']").click(); cy.url().should("include", "/svc-contracts"); + //REVIEW CONTRACT + cy.contains(`${Cypress.config("cyid")}-test-contract`).click(); //open it + cy.get("[data-cy=contextmenu]").click(); + cy.get("[data-cy='app:review']").click(); + cy.url().should("include", "/home-reviews"); + cy.get("[data-cy='review-list:new']:first").click(); + cy.get("[data-cy=name]").type( + `${Cypress.config("cyid")}-test-review{enter}` + ); + cy.get("[data-cy='reviewDate:date']").type(dToday); + cy.get("[data-cy='reviewDate:time']").type(tOneHourFromNow); + cy.get("[data-cy=notes]").type( + `I'm a review for a contract{enter}eot{enter}` + ); + cy.get("[data-cy='review-edit:save'] > .v-btn__content").click(); + cy.get("[data-cy='review-edit:save']").should("be.disabled"); + cy.go("back"); //back to list + //confirm it's in the list + cy.contains(`${Cypress.config("cyid")}-test-review`); cy.contains(`${Cypress.config("cyid")}-test-contract`); + //should show review made above in schedule + cy.get("[data-cy=navicon]").click(); + cy.get("[data-cy=home]").click(); + cy.get("[data-cy='nav/home-schedule']").click(); + cy.url().should("include", "/home-schedule"); + cy.get(".v-present > .v-calendar-weekly__day-label > .v-btn").click({force:true}); + cy.contains("12 PM");//just something to find in day view to confirm we made it there + cy.contains(`${Cypress.config("cyid")}-test-review`); //NOTIFICATION cy.get("[data-cy=notification]").click(); @@ -171,12 +196,8 @@ describe("When Accounting user logs in", () => { cy.contains("Object created"); cy.contains(`${Cypress.config("cyid")}-test-contract`); - //========================================================= - // cy.get("[data-cy='nav/home-reminders']"); - // cy.get("[data-cy='nav/home-reviews']"); - // cy.get("[data-cy='nav/home-user-settings']"); - // cy.get("[data-cy='nav/home-notify-subscriptions']"); + // cy.get("[data-cy='nav/home-history']"); //-----------------------------------------------------