Merge branch 'develop' into fix-issue-6241

ohcnetwork · Oct 9, 2023 · 02e05cd · 02e05cd
2 parents 4bb6911 + e64138c
commit 02e05cd
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 15 deletions.
diff --git a/cypress/e2e/assets_spec/asset_homepage.cy.ts b/cypress/e2e/assets_spec/asset_homepage.cy.ts
@@ -73,7 +73,7 @@ describe("Asset Tab", () => {
     assetFilters.assertAssetTypeText("INTERNAL");
     assetFilters.assertAssetClassText("ONVIF");
     assetFilters.assertStatusText("ACTIVE");
-    assetFilters.assertLocationText("Camera Locations");
+    assetFilters.assertLocationText("Camera Loc");
     assetFilters.clickadvancefilter();
     assetFilters.clearFilters();
   });
@@ -90,9 +90,8 @@ describe("Asset Tab", () => {
     assetPage.selectImportOption();
     assetPage.selectImportFacility("Dummy Facility 1");
     assetPage.importAssetFile();
-    assetPage.selectImportLocation("Camera Locations");
+    assetPage.selectImportLocation("Camera Loc");
     assetPage.clickImportAsset();
-    assetPage.verifySuccessNotification("Assets imported successfully");
   });
 
   it("verify imported asset", () => {

diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -49,15 +49,15 @@ export class PatientConsultationPage {
       .click()
       .type("1A");
     cy.get("#icd11_diagnoses_object [role='option']")
-      .contains("1A03 Intestinal infections due to Escherichia coli")
+      .contains("1A00 Cholera")
       .scrollIntoView()
       .click();
     cy.get("label[for='icd11_diagnoses_object']").click();
     cy.wait("@getIcdResults").its("response.statusCode").should("eq", 200);
 
     cy.get("#icd11_principal_diagnosis [role='combobox']").click().type("1A");
     cy.get("#icd11_principal_diagnosis [role='option']")
-      .contains("1A03 Intestinal infections due to Escherichia coli")
+      .contains("1A00 Cholera")
       .click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);