Merge pull request #6208 from coronasafe/develop

Production Release; Sep Week 1

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -56,7 +56,7 @@ describe("Asset", () => {
       "[email protected]",
       "Vendor's Name",
       serialNumber,
-      "2021-12-25",
+      "25122021",
       "Test note for asset creation!"
     );
 
@@ -80,7 +80,7 @@ describe("Asset", () => {
       "[email protected]",
       "Vendor's Name",
       serialNumber,
-      "2021-12-25",
+      "25122021",
       "Test note for asset creation!"
     );
 

cypress/e2e/patient_spec/patient_crud.cy.ts

@@ -3,7 +3,8 @@ import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 const username = "devdistrictadmin";
 const password = "Coronasafe@123";
 const phone_number = "9" + Math.floor(100000000 + Math.random() * 900000000);
-const emergency_phone_number = "9430123487";
+const emergency_phone_number =
+  "9" + Math.floor(100000000 + Math.random() * 900000000);
 const yearOfBirth = "2023";
 let patient_url = "";
 
@@ -104,9 +105,11 @@ describe("Patient Creation with consultation", () => {
     cy.get("[data-testid=name] input").clear();
     cy.get("[data-testid=name] input").type("Test E2E User Edited");
     cy.get("#phone_number-div").clear();
-    cy.get("#phone_number-div").type("+919846856666");
+    cy.get("#phone_number-div").type("+91").type(phone_number);
     cy.get("#emergency_phone_number-div").clear();
-    cy.get("#emergency_phone_number-div").type("+919120330220");
+    cy.get("#emergency_phone_number-div")
+      .type("+91")
+      .type(emergency_phone_number);
     cy.get("#present_health").type("Severe Cough");
     cy.get("#ongoing_medication").type("Paracetamol");
     cy.get("#allergies").type("Dust");
@@ -142,10 +145,7 @@ describe("Patient Creation with consultation", () => {
       "contain",
       "Test E2E User Edited"
     );
-    cy.get("[data-testid=patient-dashboard]").should(
-      "contain",
-      "+919120330220"
-    );
+    cy.get("[data-testid=patient-dashboard]").should("contain", phone_number);
     const patientDetails_values: string[] = [
       "Severe Cough",
       "Paracetamol",
@@ -165,6 +165,7 @@ describe("Patient Creation with consultation", () => {
     cy.intercept("GET", "**/api/v1/patient/**").as("getFacilities");
     cy.visit(patient_url + "/consultation");
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+    cy.get("#history_of_present_illness").scrollIntoView;
     cy.get("#history_of_present_illness").should("be.visible");
     cy.get("#history_of_present_illness").click().type("histroy");
     cy.get("#consultation_status")

cypress/e2e/users_spec/user_crud.cy.ts

@@ -38,7 +38,7 @@ describe("User management", () => {
     cy.intercept(/\/api\/v1\/facility/).as("facility");
     cy.get("[name='facilities']")
       .click()
-      .type("cypress facility")
+      .type("Dummy Facility 1")
       .wait("@facility");
     cy.get("li[role='option']").first().click();
     cy.get("input[type='checkbox']").click();
@@ -93,7 +93,7 @@ describe("User management", () => {
       cy.get("button[id='facilities']").click();
       cy.wait("@userFacility")
         .getAttached("div[id=facility_0] > div > span")
-        .contains("cypress facility");
+        .contains("Dummy Facility 1");
     });
   });
 
@@ -102,7 +102,7 @@ describe("User management", () => {
     cy.intercept(/\/api\/v1\/facility/).as("getFacilities");
     cy.get("[name='facility']")
       .click()
-      .type("cypress facility")
+      .type("Dummy Facility 1")
       .wait("@getFacilities");
     cy.get("li[role='option']").first().click();
     cy.intercept(/\/api\/v1\/users\/\w+\/add_facility\//).as("addFacility");

cypress/pageobject/Asset/AssetCreation.ts

@@ -67,9 +67,10 @@ export class AssetPage {
     cy.get("[data-testid=asset-support-email-input] input").type(supportEmail);
     cy.get("[data-testid=asset-vendor-name-input] input").type(vendorName);
     cy.get("[data-testid=asset-serial-number-input] input").type(serialNumber);
-    cy.get("[data-testid=asset-last-serviced-on-input] input").type(
-      lastServicedOn
-    );
+    cy.get(
+      "[data-testid=asset-last-serviced-on-input] input[type='text']"
+    ).click();
+    cy.get("#date-input").click().type(lastServicedOn);
     cy.get("[data-testid=asset-notes-input] textarea").type(notes);
   }