Merge Develop To Staging v24.49.0

.gitattributes

@@ -0,0 +1 @@
+* text=auto

cypress/e2e/patient_spec/PatientRegistration.cy.ts

@@ -40,10 +40,12 @@ describe("Patient Creation with consultation", () => {
   const patientDateOfBirth = "01012001";
   const patientMenstruationStartDate = getRelativeDateString(-10);
   const patientDateOfDelivery = getRelativeDateString(-20);
-  const patientOneName = "Patient With No Consultation";
+  const patientOneName = "Great Napolean 14";
   const patientOneGender = "Male";
   const patientOneUpdatedGender = "Female";
-  const patientOneAddress = "Test Patient Address";
+  const patientOneAddress = `149/J, 3rd Block,
+  Aluva
+  Ernakulam, Kerala - 682001`;
   const patientOnePincode = "682001";
   const patientOneState = "Kerala";
   const patientOneDistrict = "Ernakulam";
@@ -130,6 +132,7 @@ describe("Patient Creation with consultation", () => {
       "Middle Class",
       "Family member",
     );
+
     patientMedicalHistory.verifyPatientMedicalDetails(
       patientOnePresentHealth,
       patientOneOngoingMedication,
@@ -214,11 +217,9 @@ describe("Patient Creation with consultation", () => {
     patientMedicalHistory.verifyNoSymptosPresent("Diabetes");
     // verify insurance details and dedicatd page
     cy.get("[data-testid=patient-details]")
-      .contains("member id")
+      .contains("Member ID")
       .scrollIntoView();
     cy.wait(2000);
-    patientInsurance.clickPatientInsuranceViewDetail();
-    cy.wait(3000);
     patientInsurance.verifyPatientPolicyDetails(
       patientOneFirstSubscriberId,
       patientOneFirstPolicyId,

cypress/pageobject/Patient/PatientConsultation.ts

@@ -122,9 +122,10 @@ export class PatientConsultationPage {
   }
 
   clickViewConsultationButton() {
+    cy.get("a").contains("Encounters").click();
     cy.verifyAndClickElement(
       "#view_consultation_and_log_updates",
-      "View Consultation / Log Updates",
+      "View Updates",
     );
   }
 

cypress/pageobject/Patient/PatientCreation.ts

@@ -181,7 +181,7 @@ export class PatientPage {
       expect($dashboard).to.contain(patientName);
       expect($dashboard).to.contain(phoneNumber);
       expect($dashboard).to.contain(emergencyPhoneNumber);
-      expect($dashboard).to.contain(yearOfBirth);
+      //expect($dashboard).to.contain(yearOfBirth); //Commented out because new proposed UI does not have DOB. Can change later.
       expect($dashboard).to.contain(bloodGroup);
       expect($dashboard).to.contain(occupation);
       socioeconomicStatus && expect($dashboard).to.contain(socioeconomicStatus);
@@ -221,7 +221,7 @@ export class PatientPage {
   }
 
   clickPatientUpdateDetails() {
-    cy.verifyAndClickElement("#update-patient-details", "Update Details");
+    cy.verifyAndClickElement("#update-patient-details", "Edit Profile");
   }
 
   interceptFacilities() {

cypress/pageobject/Patient/PatientMedicalHistory.ts

@@ -33,7 +33,9 @@ class PatientMedicalHistory {
     patientSymptoms6: string,
     patientSymptoms7: string,
   ) {
-    cy.get("[data-testid=patient-details]").then(($dashboard) => {
+    cy.get("a").contains("Health Profile").click();
+    cy.wait(2000);
+    cy.get("[data-test-id=patient-health-profile]").then(($dashboard) => {
       cy.url().should("include", "/facility/");
       expect($dashboard).to.contain(patientPresentHealth);
       expect($dashboard).to.contain(patientOngoingMedication);

cypress/pageobject/Patient/PatientPredefined.ts

@@ -19,7 +19,9 @@ class PatientPredefined {
     patientPage.typePatientDateOfBirth("01012001");
     patientPage.typePatientName("Patient With Predefined Data");
     patientPage.selectPatientGender("Male");
-    patientPage.typePatientAddress("Test Patient Address");
+    patientPage.typePatientAddress(
+      "149/J, 3rd Block, Aluva, Ernakulam - 682001",
+    );
     facilityPage.fillPincode("682001");
     facilityPage.selectStateOnPincode("Kerala");
     facilityPage.selectDistrictOnPincode("Ernakulam");

cypress/pageobject/Sample/SampleTestCreate.ts

@@ -1,5 +1,6 @@
 export class SampleTestPage {
   visitSampleRequestPage(): void {
+    cy.get("a").contains("Service Request").click();
     cy.verifyAndClickElement("#sample-request-btn", "Request Sample Test");
     cy.url().should("include", "/sample-test");
   }
@@ -60,6 +61,7 @@ export class SampleTestPage {
     fastTrack: string,
     sampleTestResult: string,
   ): void {
+    cy.get("a").contains("Service Request").click();
     cy.verifyContentPresence("#sample-test-status", [sampleTestStatus]);
     cy.verifyContentPresence("#sample-test-type", [sampleTestType]);
     cy.verifyContentPresence("#sample-test-fast-track", [fastTrack]);