fix merge conflicts

i0am0arunava · Dec 5, 2024 · 1507227 · 1507227
2 parents 14aff33 + 6e3f6e3
commit 1507227
Show file tree

Hide file tree

Showing 31 changed files with 607 additions and 448 deletions.
diff --git a/cypress/e2e/assets_spec/AssetsCreation.cy.ts b/cypress/e2e/assets_spec/AssetsCreation.cy.ts
@@ -43,21 +43,21 @@ describe("Asset", () => {
 
     const qr_id_1 = uuidv4();
 
-    assetPage.enterAssetDetails(
-      "New Test Asset 1",
-      "Test Description",
-      "Working",
-      qr_id_1,
-      "Manufacturer's Name",
-      "2025-12-25",
-      "Customer Support's Name",
-      phone_number,
-      "[email protected]",
-      "Vendor's Name",
-      serialNumber,
-      "25122021",
-      "Test note for asset creation!",
-    );
+    assetPage.enterAssetDetails({
+      name: "New Test Asset 1",
+      description: "Test Description",
+      workingStatus: "Working",
+      qrId: qr_id_1,
+      manufacturer: "Manufacturer's Name",
+      warranty: "2025-12-25",
+      supportName: "Customer Support's Name",
+      supportPhone: phone_number,
+      supportEmail: "[email protected]",
+      vendorName: "Vendor's Name",
+      serialNumber: serialNumber,
+      lastServicedOn: "25122021",
+      notes: "Test note for asset creation!",
+    });
 
     assetPage.clickCreateAddMore();
     assetPage.verifySuccessNotification("Asset created successfully");
@@ -66,21 +66,21 @@ describe("Asset", () => {
 
     assetPage.selectLocation("Camera Loc");
     assetPage.selectAssetClass("ONVIF Camera");
-    assetPage.enterAssetDetails(
-      "New Test Asset 2",
-      "Test Description",
-      "Working",
-      qr_id_2,
-      "Manufacturer's Name",
-      "2025-12-25",
-      "Customer Support's Name",
-      phone_number,
-      "[email protected]",
-      "Vendor's Name",
-      serialNumber,
-      "25122021",
-      "Test note for asset creation!",
-    );
+    assetPage.enterAssetDetails({
+      name: "New Test Asset 2",
+      description: "Test Description",
+      workingStatus: "Working",
+      qrId: qr_id_2,
+      manufacturer: "Manufacturer's Name",
+      warranty: "2025-12-25",
+      supportName: "Customer Support's Name",
+      supportPhone: phone_number,
+      supportEmail: "[email protected]",
+      vendorName: "Vendor's Name",
+      serialNumber: serialNumber,
+      lastServicedOn: "25122021",
+      notes: "Test note for asset creation!",
+    });
 
     assetPage.interceptAssetCreation();
     assetPage.clickCreateAsset();
@@ -139,21 +139,22 @@ describe("Asset", () => {
 
     const qr_id_1 = uuidv4();
 
-    assetPage.enterAssetDetails(
-      "New Test Asset Vital",
-      "Test Description",
-      "Working",
-      qr_id_1,
-      "Manufacturer's Name",
-      "2025-12-25",
-      "Customer Support's Name",
-      phone_number,
-      "[email protected]",
-      "Vendor's Name",
-      serialNumber,
-      "25122021",
-      "Test note for asset creation!",
-    );
+    assetPage.enterAssetDetails({
+      name: "New Test Asset Vital",
+      description: "Test Description",
+      workingStatus: "Working",
+      qrId: qr_id_1,
+      manufacturer: "Manufacturer's Name",
+      warranty: "2025-12-25",
+      supportName: "Customer Support's Name",
+      supportPhone: phone_number,
+      supportEmail: "[email protected]",
+      vendorName: "Vendor's Name",
+      serialNumber: serialNumber,
+      lastServicedOn: "25122021",
+      notes: "Test note for asset creation!",
+    });
+
     assetPage.interceptAssetCreation();
     assetPage.clickCreateAsset();
     assetPage.verifyAssetCreation();

diff --git a/cypress/e2e/facility_spec/FacilityCreation.cy.ts b/cypress/e2e/facility_spec/FacilityCreation.cy.ts
@@ -4,7 +4,6 @@ import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
-import { UserCreationPage } from "../../pageobject/Users/UserCreation";
 import { nonAdminRoles } from "../../pageobject/utils/userConfig";
 
 describe("Facility Creation", () => {
@@ -13,7 +12,6 @@ describe("Facility Creation", () => {
   const loginPage = new LoginPage();
   const facilityHome = new FacilityHome();
   const manageUserPage = new ManageUserPage();
-  const userCreationPage = new UserCreationPage();
   const facilityFeature = [
     "CT Scan",
     "X-Ray",
@@ -87,7 +85,7 @@ describe("Facility Creation", () => {
     facilityPage.scrollToFacilityTriage();
     facilityPage.clickAddFacilityTriage();
     manageUserPage.clickSubmit();
-    userCreationPage.verifyErrorMessages(triageErrorMessage);
+    cy.verifyErrorMessages(triageErrorMessage);
     // create a entry and verify reflection
     facilityPage.fillEntryDate(triageDate);
     facilityPage.fillTriageEntryFields(
@@ -123,7 +121,7 @@ describe("Facility Creation", () => {
     // create facility with multiple capacity and verify form error message for facility form
     facilityPage.visitCreateFacilityPage();
     facilityPage.submitForm();
-    userCreationPage.verifyErrorMessages(facilityErrorMessage);
+    cy.verifyErrorMessages(facilityErrorMessage);
     facilityPage.fillFacilityName(facilityName);
     facilityPage.selectFacilityType(facilityType);
     facilityPage.clickfacilityfeatureoption();
@@ -270,12 +268,12 @@ describe("Facility Creation", () => {
     // add no bed capacity and verify form error message
     facilityPage.isVisibleselectBedType();
     facilityPage.saveAndExitBedCapacityForm();
-    userCreationPage.verifyErrorMessages(bedErrorMessage);
+    cy.verifyErrorMessages(bedErrorMessage);
     facilityPage.clickcancelbutton();
     // add no doctor capacity and verify form error message
     facilityPage.isVisibleAreaOfSpecialization();
     facilityPage.clickdoctorcapacityaddmore();
-    userCreationPage.verifyErrorMessages(doctorErrorMessage);
+    cy.verifyErrorMessages(doctorErrorMessage);
     facilityPage.clickcancelbutton();
     cy.url().then((newUrl) => {
       facilityUrl1 = newUrl;

diff --git a/cypress/e2e/facility_spec/FacilityHomepage.cy.ts b/cypress/e2e/facility_spec/FacilityHomepage.cy.ts
@@ -181,7 +181,7 @@ describe("Facility Homepage Function", () => {
     cy.clickSubmitButton("Notify");
     facilityNotify.verifyErrorMessage(notificationErrorMsg);
     // close pop-up and verify
-    facilityHome.verifyAndCloseNotifyModal();
+    cy.clickCancelButton("Cancel");
     // signout as district admin and login as a Nurse
     loginPage.ensureLoggedIn();
     loginPage.clickSignOutBtn();