From 158adf21f75fb790992fa73ac20b7ebc084202ce Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 20 Dec 2021 20:29:23 +0000 Subject: [PATCH] --- e2e/support/commands.js | 38 +++++++++---------- e2e/support/index.js | 3 +- .../regression/accounting-user/0200-memo.js | 9 +---- .../accounting-user/0300-reminder.js | 38 +++++++++++++++++++ 4 files changed, 58 insertions(+), 30 deletions(-) create mode 100644 e2e/tests/regression/accounting-user/0300-reminder.js diff --git a/e2e/support/commands.js b/e2e/support/commands.js index ddb1e42..ac92f09 100644 --- a/e2e/support/commands.js +++ b/e2e/support/commands.js @@ -38,9 +38,9 @@ Cypress.Commands.add("ayChooseGZPickList", (dataCyTag, selectionText) => { }); Cypress.Commands.add("ayLogin", (user, urlAfterLogin) => { -if(!urlAfterLogin){ - urlAfterLogin="/ay-evaluate" -} + if (!urlAfterLogin) { + urlAfterLogin = "/ay-evaluate"; + } cy.visit("/login"); cy.get("input[name=username]").clear().type(Cypress.env(user).login); @@ -54,23 +54,19 @@ if(!urlAfterLogin){ }); Cypress.Commands.add("ayChooseExistingTags", (dataCyTag, tagList) => { - ; - for(let i=0;i{ - // t.click(); - // for(let i=0;i{ - // cy.type(z); - // cy.contains(z);//look for the text on the page - // cy.type("{downarrow}{enter}"); - // }); - //}) - +}); + +Cypress.Commands.add("aySetTestableUserOptions", () => { + cy.get("[data-cy=navicon]").click(); + cy.get("[data-cy=home]").click(); + cy.get("[data-cy='nav/home-user-settings']").click(); + cy.url().should("include", "/home-user-settings"); + cy.get("[data-cy='nativeDateTimeInput']").check({ force: true }); }); diff --git a/e2e/support/index.js b/e2e/support/index.js index c5bf933..0b577dd 100644 --- a/e2e/support/index.js +++ b/e2e/support/index.js @@ -20,4 +20,5 @@ import "./commands"; // require('./commands') //unique test run ID for all tests -Cypress.config("cyid", `cy${new Date().getTime()}`); \ No newline at end of file +Cypress.config("cyid", `cy${new Date().getTime()}`); + diff --git a/e2e/tests/regression/accounting-user/0200-memo.js b/e2e/tests/regression/accounting-user/0200-memo.js index 1f0a0b4..495a5f9 100644 --- a/e2e/tests/regression/accounting-user/0200-memo.js +++ b/e2e/tests/regression/accounting-user/0200-memo.js @@ -17,15 +17,8 @@ describe("Memo features", () => { ); cy.get("[data-cy=notes]").type( `The quick brown fox jumped{enter}over the six lazy dogs{enter}eot` - ); - - //TODO: TURN THIS INTO A COMMAND AND THEN SWAP THAT OUT EVERY EXISTING TEST WITH TAG ENTRY - - // cy.get("[data-cy=tags]").click().type("zone1{downarrow}{enter}"); //select some tags - // cy.get("[data-cy=tags]").click().type("blue{downarrow}{enter}"); - // cy.get("[data-cy=tags]").click().type("zone2{downarrow}{enter}"); + ); cy.ayChooseExistingTags("tags",['zone1','blue','zone2']); - cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click(); cy.url().should("include", "/home-memos"); //wait for nav cy.contains(`${Cypress.config("cyid")}-test-subject`).click(); //find and open memo record diff --git a/e2e/tests/regression/accounting-user/0300-reminder.js b/e2e/tests/regression/accounting-user/0300-reminder.js new file mode 100644 index 0000000..fb64627 --- /dev/null +++ b/e2e/tests/regression/accounting-user/0300-reminder.js @@ -0,0 +1,38 @@ +/// +describe("Memo features", () => { + it("should work", () => { + const dNow = new Date(); + const dToday = `${dNow.getFullYear()}-${(dNow.getMonth() + 1) + .toString() + .padStart(2, "0")}-${dNow.getDate().toString().padStart(2, "0")}`; + 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.ayLogin("accounting"); + cy.aySetTestableUserOptions(); + cy.get("[data-cy=navicon]").click(); + cy.get("[data-cy=home]").click(); + cy.get("[data-cy='nav/home-reminders']").click(); + cy.url().should("include", "/home-reminders"); + cy.get("[data-cy='reminder-list:new']:first").click(); + cy.url().should("include", "/home-reminders/"); + cy.get("[data-cy=name]").type( + `${Cypress.config("cyid")}-test-reminder{enter}` + ); + cy.get("[data-cy='startDate:date']").type(dToday); + cy.get("[data-cy='startDate:time']").type(tNow); + cy.get("[data-cy='stopDate:date']").type(dToday); + cy.get("[data-cy='stopDate:time']").type(tOneHourFromNow); + cy.get("[data-cy=notes]").type(`This is a reminder{enter}eot{enter}`); + cy.get(".v-color-picker__input > input").clear().type("#11E1D07E{enter}"); //select a color + cy.get('[data-cy="reminder-edit:save"] > .v-btn__content').click(); + cy.get("[data-cy=navicon]").click(); + cy.get("[data-cy='nav/home-reminders']").click(); + cy.url().should("include", "/home-reminders"); + }); +});