Merge pull request #9517 from ohcnetwork/develop

Merge Develop To staging v24.52.0 | Patch
ohcnetwork · Dec 20, 2024 · 326c274 · 326c274
2 parents 095faf3 + 949624f
commit 326c274
Show file tree

Hide file tree

Showing 7 changed files with 479 additions and 89 deletions.
diff --git a/cypress/e2e/patient_spec/PatientConsultationDischarge.cy.ts b/cypress/e2e/patient_spec/PatientConsultationDischarge.cy.ts
@@ -25,6 +25,7 @@ describe("Patient Discharge based on multiple reason", () => {
   });
 
   beforeEach(() => {
+    cy.viewport(1280, 720);
     cy.restoreLocalStorage();
     cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/patients");
@@ -116,8 +117,6 @@ describe("Patient Discharge based on multiple reason", () => {
     patientDischarge.interceptDischargePatient();
     cy.clickSubmitButton("Acknowledge & Submit");
     patientDischarge.verifyDischargePatient();
-    cy.verifyNotification("Patient Discharged Successfully");
-    cy.closeNotification();
     // Verify the consultation dashboard reflection
     cy.verifyContentPresence("#consultation-buttons", ["Recovered"]);
     // Verify the dashboard and discharge information

diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -103,12 +103,7 @@ export class PatientConsultationPage {
   }
 
   clickEditConsultationButton() {
-    cy.get("#consultation-buttons").scrollIntoView();
-    cy.get("button").contains("Manage Patient").click();
-    cy.verifyAndClickElement(
-      "#consultation-buttons",
-      "Edit Consultation Details",
-    );
+    cy.clickAndSelectOption("#show-more", "Edit Consultation Details", true);
   }
 
   interceptConsultation() {

diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/cypress/pageobject/Patient/PatientCreation.ts
@@ -45,8 +45,8 @@ export class PatientPage {
     cy.intercept("GET", "**/api/v1/consultation/**").as("getPatient");
     cy.get("#patient-name-list").contains(patientName).click();
     cy.wait("@getPatient").its("response.statusCode").should("eq", 200);
-    cy.get("#patient-name-consultation")
-      .should("be.visible")
+    cy.get("#patient-name-consultation", { timeout: 15000 })
+      .should("not.have.class", "hidden")
       .contains(patientName);
   }