e2e/cypress.json

@@ -3,13 +3,13 @@
     "xxxretries": 3,
     "integrationFolder": "tests",
     "supportFile": "support",
-    "baseUrl": "http://localhost:7575",
-    "xxbaseUrl": "https://test.helloayanova.com",
+    "xbaseUrl": "http://localhost:7575",
+    "baseUrl": "https://test.helloayanova.com",
     "xxxxbaseUrl": "http://localhost:8080",
     "video": false,
     "env": {
-        "apiBaseUrl": "http://localhost:7575/api/v8.0/",
-        "xapiBaseUrl": "https://test.helloayanova.com/api/v8.0/",    
+        "xapiBaseUrl": "http://localhost:7575/api/v8.0/",
+        "apiBaseUrl": "https://test.helloayanova.com/api/v8.0/",    
         "admin": {
             "login": "superuser",
             "password": "l3tm3in"

e2e/support/commands.js

@@ -63,10 +63,7 @@ Cypress.Commands.add("ayChooseExistingTags", (dataCyTag, tagList) => {
 });
 
 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.visit('/home-user-settings');
+  cy.visit("/home-user-settings");
   cy.url().should("include", "/home-user-settings");
   cy.get("[data-cy='nativeDateTimeInput']").check({ force: true });
 });

e2e/tests/regression/1-smoke/001-home.js

@@ -96,11 +96,6 @@ describe("SMOKE HOME SECTION", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=pickListSelectedUserId]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/002-customer.js

@@ -44,11 +44,7 @@ describe("SMOKE CUSTOMER SECTION", () => {
     // cy.url().should("include", "/cust-users/0");
     // cy.get("[data-cy=customerId]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
+
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/007-inventory.js

@@ -75,11 +75,7 @@ describe("SMOKE INVENTORY", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=description]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
+  
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/008-vendors.js

@@ -13,12 +13,7 @@ describe("SMOKE VENDORS SECTION", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=name]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
-
+ 
     //-----------------------------------------------------
   });
 });

e2e/tests/regression/1-smoke/009-accounting.js

@@ -34,11 +34,7 @@ describe("SMOKE", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=name]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
+  
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/010-administration.js

@@ -73,11 +73,7 @@ describe("SMOKE ADMIN SECTION", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=ayaType]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
+  
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/011-server-operations.js

@@ -48,11 +48,6 @@ describe("SMOKE OPERATIONS SECTION", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=configCard]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/012-misc.js

@@ -45,11 +45,6 @@ describe("SMOKE MISC", () => {
     cy.url().should("include", "/no-features-available");
     cy.get("[data-cy=NFA]");
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/013-customer-user.js

@@ -16,11 +16,7 @@ describe("SMOKE CUSTOMER SECTION", () => {
     //path: "/customer-workorders/:recordid",
     //path: "/customer-csr/:recordid"
 
-    //LOGOUT
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=logout]").click();
-    cy.url().should("include", "/login");
-    cy.get("[data-cy=generalerror]").should("not.exist");
+
 
     //-----------------------------------------------------
   });

e2e/tests/regression/1-smoke/014-nav-menu.js

@@ -0,0 +1,28 @@
+// Basic smoke test, visit every form to ensure they load
+
+describe("SMOKE NAV", () => {
+  it("Nav and menu functions correctly", () => {
+    cy.ayLogin("admin");
+    cy.get("[data-cy=navicon]").click();
+    cy.get("[data-cy=home]").click();
+    cy.get("[data-cy='nav/home-memos']").click();
+    
+    // cy.visit("/vendors");
+    // cy.url().should("include", "/vendors");
+    // cy.get("[data-cy=generalerror]").should("not.exist");
+    // cy.get("[data-cy=vendorsTable]");
+
+    // cy.visit("/vendors/1");
+    // cy.url().should("include", "vendors/1");
+    // cy.get("[data-cy=generalerror]").should("not.exist");
+    // cy.get("[data-cy=name]");
+
+    // //LOGOUT
+    // cy.get("[data-cy=navicon]").click();
+    // cy.get("[data-cy=logout]").click();
+    // cy.url().should("include", "/login");
+    // cy.get("[data-cy=generalerror]").should("not.exist");
+
+    //-----------------------------------------------------
+  });
+});

e2e/tests/regression/accounting-user/000-setup.js

@@ -1,20 +1,12 @@
 /// <reference types="cypress" />
-describe.skip("When Accounting user logs in", () => {
-  it("should set up accounting block user options", () => {
+describe("Login nav menu", () => {
+  it("should display user name", () => {
     cy.ayLogin("accounting");
 
     //open nav pane
     cy.get("[data-cy=navicon]").click();
     cy.contains("- Accounting"); //part of name displayed at top
 
-    //USER OPTIONS
-    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 });
-
-    //END OF TEST
     //-----------------------------------------------------
   });
 });

e2e/tests/regression/accounting-user/0200-memo.js

@@ -1,50 +1,48 @@
 /// <reference types="cypress" />
 describe("Memo features", () => {
-    it("should work", () => {  
-        cy.ayLogin("accounting");
-        cy.get("[data-cy=navicon]").click();
-        cy.get("[data-cy=home]").click();
-        cy.get("[data-cy='nav/home-memos']").click();
-        cy.url().should("include", "/home-memos");
-        cy.get("[data-cy=memosTable]");
-        cy.get("[data-cy='memo-list:new']").click();
-        cy.url().should("include", "/home-memos/");
-        cy.get("[data-cy=pickListSelectedUserId]")
-          .click()
-          .type("accounting{downarrow}{enter}"); //select Accounting user (self)
-        cy.get("[data-cy=name]").type(
-          `${Cypress.config("cyid")}-test-subject{enter}`
-        );
-        cy.get("[data-cy=notes]").type(
-          `The quick brown fox jumped{enter}over the six lazy dogs{enter}eot`
-        );    
-        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
-        cy.contains("zone1");
-        cy.contains("blue");
-        cy.contains("zone2");
-    
-        //reply
-        cy.get("[data-cy=contextmenu]").click();
-        cy.get("[data-cy='memo-edit:reply']").click();
-        cy.url().should("include", "/home-memos/");
-        cy.get("[data-cy=notes]").type(`this is my reply`);
-        cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click();
-        cy.contains(`RE: ${Cypress.config("cyid")}-test-subject`).click(); //find and open reply
-    
-        //forward to superuser
-        cy.get("[data-cy=contextmenu]").click();
-        cy.get("[data-cy='memo-edit:forward']").click();
-        cy.url().should("include", "/home-memos/");
-        cy.get("[data-cy=notes]").type(
-          `Hello SuperUser this is my forward to you!{enter}eot{enter}`
-        );
-        cy.get("[data-cy=pickListSelectedUserId]")
-          .click()
-          .type("SuperUser{downarrow}{enter}");
-        cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click();
-    });
+  it("should work", () => {
+    cy.ayLogin("accounting");
+
+    cy.visit("/home-memos");
+    cy.url().should("include", "/home-memos");
+    cy.get("[data-cy=memosTable]");
+    cy.get("[data-cy='memo-list:new']").click();
+    cy.url().should("include", "/home-memos/");
+    cy.get("[data-cy=pickListSelectedUserId]")
+      .click()
+      .type("accounting{downarrow}{enter}"); //select Accounting user (self)
+    cy.get("[data-cy=name]").type(
+      `${Cypress.config("cyid")}-test-subject{enter}`
+    );
+    cy.get("[data-cy=notes]").type(
+      `The quick brown fox jumped{enter}over the six lazy dogs{enter}eot`
+    );
+    cy.ayChooseExistingTags("tags", ["zone1", "blue", "zone2"]);
+    cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click();
+    cy.url().should("include", "/home-memos"); 
+    cy.contains(`${Cypress.config("cyid")}-test-subject`).click(); //find and open memo record
+    cy.contains("zone1");
+    cy.contains("blue");
+    cy.contains("zone2");
+
+    //reply
+    cy.get("[data-cy=contextmenu]").click();
+    cy.get("[data-cy='memo-edit:reply']").click();
+    cy.url().should("include", "/home-memos/");
+    cy.get("[data-cy=notes]").type(`this is my reply`);
+    cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click();
+    cy.contains(`RE: ${Cypress.config("cyid")}-test-subject`).click(); //find and open reply
+
+    //forward to superuser
+    cy.get("[data-cy=contextmenu]").click();
+    cy.get("[data-cy='memo-edit:forward']").click();
+    cy.url().should("include", "/home-memos/");
+    cy.get("[data-cy=notes]").type(
+      `Hello SuperUser this is my forward to you!{enter}eot{enter}`
+    );
+    cy.get("[data-cy=pickListSelectedUserId]")
+      .click()
+      .type("SuperUser{downarrow}{enter}");
+    cy.get("[data-cy='memo-edit:save'] > .v-btn__content").click();
   });
-  
+});

e2e/tests/regression/accounting-user/0300-reminder.js

@@ -15,9 +15,6 @@ describe("Reminder features", () => {
 
     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.visit("/home-reminders");
     cy.url().should("include", "/home-reminders");
     cy.get("[data-cy='reminder-list:new']:first").click();
@@ -32,14 +29,10 @@ describe("Reminder features", () => {
     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.visit("/home-reminders");
     cy.url().should("include", "/home-reminders");
 
     //should show reminder made above in month display by default
-    // cy.get("[data-cy=navicon]").click();
-    // cy.get("[data-cy='nav/home-schedule']").click();
     cy.visit("/home-schedule");
     cy.url().should("include", "/home-schedule");
     cy.contains(`${Cypress.config("cyid")}-test-reminder`);

e2e/tests/regression/accounting-user/0400-notify-subscribe.js

@@ -3,10 +3,6 @@ describe("Notify subscribe", () => {
   it("should work", () => {
     cy.ayLogin("accounting");
     cy.aySetTestableUserOptions();
-    // cy.get("[data-cy=navicon]").click();
-    // cy.get("[data-cy=home]").click();
-    // cy.get("[data-cy=navicon]").click();
-    // cy.get("[data-cy='nav/home-notify-subscriptions']").click();
     cy.visit("/home-notify-subscriptions");
     cy.url().should("include", "/home-notify-subscriptions");
     cy.get("[data-cy='notify-subscriptions:new']:first").click();
@@ -14,9 +10,6 @@ describe("Notify subscribe", () => {
     cy.ayChooseVSelect("eventType", "Object created");
     cy.ayChooseVSelect("ayaType", "Contract");
     cy.get("[data-cy='notify-subscription:save'] > .v-btn__content").click();
-    //confirm
-    // cy.get("[data-cy=navicon]").click();
-    // cy.get("[data-cy='nav/home-notify-subscriptions']").click();
     cy.visit("/home-notify-subscriptions");
     cy.url().should("include", "/home-notify-subscriptions");
     cy.contains("Object created");

e2e/tests/regression/accounting-user/0500-contract-create-review-history.js

@@ -15,11 +15,8 @@ describe("Contract create, review, history", () => {
 
     cy.ayLogin("accounting");
     cy.aySetTestableUserOptions();
-      
-    // cy.get("[data-cy=navicon]").click();
-    // cy.get("[data-cy=accounting]").click();
-    // cy.get("[data-cy='nav/svc-contracts']").click();
-    cy.visit('/svc-contracts')
+
+    cy.visit("/svc-contracts");
     cy.url().should("include", "/svc-contracts");
     cy.get("[data-cy=contractsTable]");
     cy.get("[data-cy='contract-list:new']:first").click();
@@ -35,12 +32,9 @@ describe("Contract create, review, history", () => {
       `Test contract alert message{enter}eot{enter}`
     );
     cy.get("[data-cy='contract-edit:save'] > .v-btn__content").click();
-    // cy.get("[data-cy=navicon]").click();
-    // cy.get("[data-cy='nav/svc-contracts']").click();
-    cy.visit('/svc-contracts')
+    cy.visit("/svc-contracts");
     cy.url().should("include", "/svc-contracts");
 
-    
     //REVIEW CONTRACT
     cy.contains(`${Cypress.config("cyid")}-test-contract`).click(); //open it
     cy.get("[data-cy=contextmenu]").click();
@@ -61,11 +55,7 @@ describe("Contract create, review, history", () => {
     //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.visit('/home-schedule')
+    cy.visit("/home-schedule");
     cy.url().should("include", "/home-schedule");
     cy.get(".v-present > .v-calendar-weekly__day-label > .v-btn").click({
       force: true
@@ -74,14 +64,12 @@ describe("Contract create, review, history", () => {
     cy.contains(`${Cypress.config("cyid")}-test-review`);
 
     //HISTORY
-     cy.get("[data-cy=navicon]").click();
-     cy.get("[data-cy=home]").click();  
-     cy.get("[data-cy='nav/home-history']").click();
-    //cy.visit("/history");
+    //NOTE: this must be done through menu or else would need to lookup user id etc
+    cy.get("[data-cy=navicon]").click();
+    cy.get("[data-cy=home]").click();
+    cy.get("[data-cy='nav/home-history']").click();
     cy.url().should("include", "/history");
     cy.contains(`${Cypress.config("cyid")}-test-contract`);
     cy.contains(`${Cypress.config("cyid")}-test-review`);
-    // cy.contains(`${Cypress.config("cyid")}-test-reminder`);
-    // cy.contains(`${Cypress.config("cyid")}-test-subject`);
   });
 });

e2e/tests/regression/accounting-user/0600-service-rate.js

@@ -2,9 +2,8 @@
 describe("Service rate", () => {
   it("should work", () => {
     cy.ayLogin("accounting");
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=accounting]").click();
-    cy.get("[data-cy='nav/acc-service-rates']").click();
+
+    cy.visit("/acc-service-rates");
     cy.url().should("include", "/acc-service-rates");
     cy.get("[data-cy=serviceRatesTable]");
     cy.get("[data-cy='service-rate-list:new']:first").click();
@@ -19,8 +18,7 @@ describe("Service rate", () => {
     cy.ayChooseVSelect("unit", "hour");
     cy.get("[data-cy=notes]").type(`Test svc rate NOTES!!!{enter}eot{enter}`);
     cy.get("[data-cy='service-rate-edit:save'] > .v-btn__content").click();
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy='nav/acc-service-rates']").click();
+    cy.visit("/acc-service-rates");
     cy.url().should("include", "/acc-service-rates");
     cy.contains(`${Cypress.config("cyid")}-test-service-rate`);
 

e2e/tests/regression/accounting-user/0700-travel-rate.js

@@ -2,9 +2,7 @@
 describe("Travel rate", () => {
   it("should work", () => {
     cy.ayLogin("accounting");
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=accounting]").click();
-    cy.get("[data-cy='nav/acc-travel-rates']").click();
+    cy.visit("/acc-travel-rates");
     cy.url().should("include", "/acc-travel-rates");
     cy.get("[data-cy=travelRatesTable]");
     cy.get("[data-cy='travel-rate-list:new']:first").click();
@@ -19,8 +17,8 @@ describe("Travel rate", () => {
     cy.get("[data-cy=unit]").type("{downarrow}{enter}"); //choose first in list
     cy.get("[data-cy=notes]").type(`Test trvl rate NOTES!!!{enter}eot{enter}`);
     cy.get("[data-cy='travel-rate-edit:save'] > .v-btn__content").click();
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy='nav/acc-travel-rates']").click();
+
+    cy.visit("/acc-travel-rates");
     cy.url().should("include", "/acc-travel-rates");
     cy.contains(`${Cypress.config("cyid")}-test-travel-rate`);
 

e2e/tests/regression/accounting-user/0800-tax-code.js

@@ -1,11 +1,8 @@
 /// <reference types="cypress" />
 describe("Tax code", () => {
   it("should work", () => {
-    cy.ayLogin("accounting");
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy=accounting]").click();
-
-    cy.get("[data-cy='nav/acc-tax-codes']").click();
+    cy.ayLogin("accounting");    
+    cy.visit("/acc-tax-codes");
     cy.url().should("include", "/acc-tax-codes");
     cy.get("[data-cy=taxCodesTable]");
     cy.get("[data-cy='tax-code-list:new']:first").click();
@@ -17,9 +14,8 @@ describe("Tax code", () => {
     cy.get("[data-cy=taxBPct]").type("5");
 
     cy.get("[data-cy=notes]").type(`Test tax code NOTES!!!{enter}eot{enter}`);
-    cy.get("[data-cy='tax-code-edit:save'] > .v-btn__content").click();
-    cy.get("[data-cy=navicon]").click();
-    cy.get("[data-cy='nav/acc-tax-codes']").click();
+    cy.get("[data-cy='tax-code-edit:save'] > .v-btn__content").click();   
+    cy.visit("/acc-tax-codes");
     cy.url().should("include", "/acc-tax-codes");
     cy.contains(`${Cypress.config("cyid")}-test-tax-code`);
 

e2e/tests/regression/service-user/0100-workorder.js

@@ -6,14 +6,7 @@ describe("Workorder creation", () => {
   it("should work", () => {
     cy.ayLogin("service");
     cy.aySetTestableUserOptions();
-    //open nav pane
-    cy.get("[data-cy=navicon]").click();
-    cy.contains("- Service"); //part of name displayed at top
-
-    //WORKORDER
-    
-    cy.get("[data-cy=service]").click(); //only if not setting project above
-    cy.get("[data-cy='nav/svc-workorders']").click();
+    cy.visit("/svc-workorders");
     cy.url().should("include", "/svc-workorders");
     cy.get("[data-cy=workordersTable]");
     cy.get("[data-cy='workorder-list:new']:first").click();