From 68c08d0cb0b7d151f8664414e51d913665201ecd Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 20 Dec 2021 19:20:20 +0000
Subject: [PATCH]

---
 e2e/tests/regression/0-setup/000-generate-test-db.js | 4 ++--
 e2e/tests/regression/1-smoke/003-service-misc.js     | 1 -
 e2e/tests/regression/1-smoke/004-service-wo.js       | 1 -
 e2e/tests/regression/1-smoke/005-service-quote.js    | 4 +---
 e2e/tests/regression/1-smoke/013-customer-user.js    | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/e2e/tests/regression/0-setup/000-generate-test-db.js b/e2e/tests/regression/0-setup/000-generate-test-db.js
index 76420c4..40964c9 100644
--- a/e2e/tests/regression/0-setup/000-generate-test-db.js
+++ b/e2e/tests/regression/0-setup/000-generate-test-db.js
@@ -6,8 +6,8 @@ describe("SMOKE SETUP", () => {
       url: `${Cypress.env("apiBaseUrl")}auth`,
       method: "POST",
       body: {
-        login: Cypress.env("adminusername"),
-        password: Cypress.env("adminpassword")
+        login: Cypress.env("admin").login,
+        password: Cypress.env("admin").password
       }
     })
       .its("body")
diff --git a/e2e/tests/regression/1-smoke/003-service-misc.js b/e2e/tests/regression/1-smoke/003-service-misc.js
index 572856b..270cfce 100644
--- a/e2e/tests/regression/1-smoke/003-service-misc.js
+++ b/e2e/tests/regression/1-smoke/003-service-misc.js
@@ -3,7 +3,6 @@
 describe("SMOKE SERVICE MISC SECTION", () => {
   it("Service MISC forms open without error", () => {
     cy.ayLogin("admin");
-    //################# SERVICE
     cy.visit("/svc-schedule");
     cy.url().should("include", "/svc-schedule");
     cy.get("[data-cy=generalerror]").should("not.exist");
diff --git a/e2e/tests/regression/1-smoke/004-service-wo.js b/e2e/tests/regression/1-smoke/004-service-wo.js
index b018207..d6e1bbf 100644
--- a/e2e/tests/regression/1-smoke/004-service-wo.js
+++ b/e2e/tests/regression/1-smoke/004-service-wo.js
@@ -3,7 +3,6 @@
 describe("SMOKE SERVICE WO SECTION", () => {
   it("Service WO forms open without error", () => {
     cy.ayLogin("admin");
-    //################# SERVICE WO
 
     cy.visit("/svc-workorders");
     cy.url().should("include", "/svc-workorders");
diff --git a/e2e/tests/regression/1-smoke/005-service-quote.js b/e2e/tests/regression/1-smoke/005-service-quote.js
index dd92223..6abca5a 100644
--- a/e2e/tests/regression/1-smoke/005-service-quote.js
+++ b/e2e/tests/regression/1-smoke/005-service-quote.js
@@ -2,9 +2,7 @@
 
 describe("SMOKE SERVICE QUOTE SECTION", () => {
   it("Service quote forms open without error", () => {
-    cy.ayLogin("admin");
-
-      
+    cy.ayLogin("admin");      
     cy.visit("/svc-quotes");
     cy.url().should("include", "/svc-quotes");
     cy.get("[data-cy=generalerror]").should("not.exist");
diff --git a/e2e/tests/regression/1-smoke/013-customer-user.js b/e2e/tests/regression/1-smoke/013-customer-user.js
index 97f3893..9205d59 100644
--- a/e2e/tests/regression/1-smoke/013-customer-user.js
+++ b/e2e/tests/regression/1-smoke/013-customer-user.js
@@ -2,7 +2,7 @@
 
 describe("SMOKE CUSTOMER SECTION", () => {
   it("Customer User forms open without error", () => {
-    cy.ayLogin("accounting", "/customer-csr");
+    cy.ayLogin("customer", "/customer-csr");
 
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=csrTable]");