Skip to content

Commit

Permalink
Merge branch 'develop' into ai-discharge
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashesh3 authored Oct 12, 2023
2 parents cd5c54c + 5e3012a commit da7d345
Show file tree
Hide file tree
Showing 24 changed files with 494 additions and 93 deletions.
5 changes: 2 additions & 3 deletions cypress/e2e/assets_spec/asset_homepage.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand All @@ -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", () => {
Expand Down
4 changes: 2 additions & 2 deletions cypress/pageobject/Patient/PatientConsultation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit da7d345

Please sign in to comment.