Merge branch 'develop' into develop

ohcnetwork · Feb 27, 2024 · d774b22 · d774b22
2 parents 04a5a30 + 59cb31f
commit d774b22
Show file tree

Hide file tree

Showing 32 changed files with 859 additions and 415 deletions.
diff --git a/cypress/e2e/death_report_spec/death_report.cy.ts b/cypress/e2e/death_report_spec/death_report.cy.ts
diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -136,25 +136,30 @@ describe("Facility Creation", () => {
     facilityPage.fillExpectedDTypeCylinderRequirement(oxygenExpected);
     facilityPage.selectLocation("Kochi, Kerala");
     facilityPage.submitForm();
+    cy.closeNotification();
     // create multiple bed capacity and verify card reflection
     facilityPage.selectBedType("Oxygen beds");
     facilityPage.fillTotalCapacity(bedCapacity);
     facilityPage.fillCurrentlyOccupied(bedOccupancy);
     facilityPage.clickbedcapcityaddmore();
+    cy.closeNotification();
     facilityPage.selectBedType("Ordinary Bed");
     facilityPage.fillTotalCapacity(bedCapacity);
     facilityPage.fillCurrentlyOccupied(bedOccupancy);
     facilityPage.clickbedcapcityaddmore();
+    cy.closeNotification();
     facilityPage.getTotalBedCapacity().contains(totalCapacity);
     facilityPage.getTotalBedCapacity().contains(totalOccupancy);
     facilityPage.clickcancelbutton();
     // create multiple bed capacity and verify card reflection
     facilityPage.selectAreaOfSpecialization("General Medicine");
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.clickdoctorcapacityaddmore();
+    cy.closeNotification();
     facilityPage.selectAreaOfSpecialization("Pulmonology");
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.clickdoctorcapacityaddmore();
+    cy.closeNotification();
     facilityPage.getTotalDoctorCapacity().contains(doctorCapacity);
     facilityPage.clickcancelbutton();
     facilityPage.verifyfacilitynewurl();
@@ -186,6 +191,12 @@ describe("Facility Creation", () => {
     facilityPage.getFacilityTotalBedCapacity().contains(totalOccupancy);
     facilityPage.getFacilityTotalDoctorCapacity().scrollIntoView();
     facilityPage.getFacilityTotalDoctorCapacity().contains(totalDoctor);
+    // verify the delete functionality
+    cy.get("#manage-facility-dropdown button").scrollIntoView();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickDeleteFacilityOption();
+    facilityPage.confirmDeleteFacility();
+    cy.verifyNotification("Facility deleted successfully");
   });
 
   it("Create a new facility with single bed and doctor capacity", () => {

diff --git a/cypress/e2e/facility_spec/facility_manage.cy.ts b/cypress/e2e/facility_spec/facility_manage.cy.ts
@@ -161,15 +161,6 @@ describe("Facility Manage Functions", () => {
     );
   });
 
-  it("Delete a existing facility and verify the error message", () => {
-    facilityPage.clickManageFacilityDropdown();
-    facilityPage.clickDeleteFacilityOption();
-    facilityPage.confirmDeleteFacility();
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "You do not have permission to perform this action."
-    );
-  });
-
   afterEach(() => {
     cy.saveLocalStorage();
   });