e2e/cypress.json

@@ -1,10 +1,11 @@
 {
-    "defaultCommandTimeout":7000,
+    "defaultCommandTimeout":5000,
+    "retries": 3,
     "integrationFolder": "tests",
     "supportFile":"support",
-    "xxbaseUrl": "http://localhost:7575",
+    "xbaseUrl": "http://localhost:7575",
     "baseUrl": "https://test.helloayanova.com",
-    "xbaseUrl":"http://localhost:8080",   
+    "xxxxbaseUrl":"http://localhost:8080",   
     "video":false,
     "env": {
         "xapiBaseUrl":"http://localhost:7575/api/v8.0/",

e2e/tests/regression/0-setup/000-generate-test-db.js

@@ -29,3 +29,18 @@ describe("SMOKE SETUP", () => {
     //-----------------------------------------------------
   });
 });
+function confirmJobDone(jobId, authToken) {
+  cy.request({
+    method: "GET",
+    url: `${Cypress.env("apiBaseUrl")}job-operations/status/${jobId}`,
+    auth: {
+      bearer: authToken
+    }
+  }).then((resp) => {
+    //3 means job done
+    if (resp.body.data == 3) return;
+    // else recurse
+    cy.wait(1000);
+    confirmJobDone(jobId, authToken);
+  });
+}

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

@@ -10,6 +10,7 @@ describe("SMOKE HOME SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
+    cy.url().should("include", "/ay-evaluate");
 
     //################# HOME
     cy.visit("/home-dashboard");

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

@@ -10,8 +10,7 @@ describe("SMOKE CUSTOMER SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
-   
+    cy.url().should("include", "/ay-evaluate");
 
     //################# CUSTOMERS
     cy.visit("/cust-customers");

e2e/tests/regression/1-smoke/003-service-misc.js

@@ -10,7 +10,7 @@ describe("SMOKE SERVICE MISC SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
+    cy.url().should("include", "/ay-evaluate");
     //################# SERVICE
     cy.visit("/svc-schedule");
     cy.url().should("include", "/svc-schedule");
@@ -127,7 +127,6 @@ describe("SMOKE SERVICE MISC SECTION", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=name]");
 
-  
     //-----------------------------------------------------
   });
 });

e2e/tests/regression/1-smoke/004-service-wo.js

@@ -10,7 +10,7 @@ describe("SMOKE SERVICE WO SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
+    cy.url().should("include", "/ay-evaluate");
     //################# SERVICE WO
 
     cy.visit("/svc-workorders");

e2e/tests/regression/1-smoke/005-service-quote.js

@@ -11,6 +11,7 @@ describe("SMOKE SERVICE QUOTE SECTION", () => {
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
 
+      
     cy.visit("/svc-quotes");
     cy.url().should("include", "/svc-quotes");
     cy.get("[data-cy=generalerror]").should("not.exist");

e2e/tests/regression/1-smoke/006-service-pm.js

@@ -10,13 +10,13 @@ describe("SMOKE SERVICE PM SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
+    cy.url().should("include", "/ay-evaluate");
 
     cy.visit("/svc-pms");
     cy.url().should("include", "/svc-pms");
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=pmsTable]");
 
-    
     cy.visit("/svc-pm-items");
     cy.url().should("include", "/svc-pm-items");
     cy.get("[data-cy=generalerror]").should("not.exist");
@@ -42,7 +42,6 @@ describe("SMOKE SERVICE PM SECTION", () => {
     cy.get("[data-cy=generalerror]").should("not.exist");
     cy.get("[data-cy=PMItemPartsTable]");
 
-
     cy.visit("/svc-pm-item-labors");
     cy.url().should("include", "/svc-pm-item-labors");
     cy.get("[data-cy=generalerror]").should("not.exist");

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

@@ -10,8 +10,8 @@ describe("SMOKE INVENTORY", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
-
+    cy.url().should("include", "/ay-evaluate");
+    
     //################# INVENTORY
     cy.visit("/inv-parts");
     cy.url().should("include", "/inv-parts");

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

@@ -10,8 +10,8 @@ describe("SMOKE VENDORS SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
-
+    cy.url().should("include", "/ay-evaluate");
+    
     //################# VENDORS
     cy.visit("/vendors");
     cy.url().should("include", "/vendors");

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

@@ -10,6 +10,7 @@ describe("SMOKE", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
+    cy.url().should("include", "/ay-evaluate");
 
     //################# ACCOUNTING
 

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

@@ -10,7 +10,7 @@ describe("SMOKE ADMIN SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
+    cy.url().should("include", "/ay-evaluate");
     //################# ADMIN
     cy.visit("/adm-global-settings");
     cy.url().should("include", "/adm-global-settings");

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

@@ -10,7 +10,7 @@ describe("SMOKE OPERATIONS SECTION", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
+    cy.url().should("include", "/ay-evaluate");
 
     //################# OPERATIONS
     cy.visit("/ops-backup");

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

@@ -10,8 +10,8 @@ describe("SMOKE MISC", () => {
     cy.get("input[name=password]")
       .clear()
       .type(`${Cypress.env("adminpassword")}{enter}`);
-
-
+    cy.url().should("include", "/ay-evaluate");
+    cy.url().should("include", "/ay-evaluate");
     //################# MISC
     cy.visit("/about");
     cy.url().should("include", "/about");