Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the recent cypress Flaky Test across the platform #7074

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Fixed the recent cypress Flaky Test across the platform #7074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cypress/e2e/assets_spec/asset_homepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ describe("Asset Tab", () => {

it("Filter Asset", () => {
assetFilters.filterAssets(
"Dummy Facility 1",
"Dummy Facility 40",
"INTERNAL",
"ACTIVE",
"ONVIF Camera",
"Camera Loc"
);
assetFilters.clickadvancefilter();
assetFilters.clickslideoverbackbutton(); // to verify the back button doesn't clear applied filters
assetFilters.assertFacilityText("Dummy Facility 1");
assetFilters.assertFacilityText("Dummy Facility 40");
assetFilters.assertAssetTypeText("INTERNAL");
assetFilters.assertAssetClassText("ONVIF");
assetFilters.assertStatusText("ACTIVE");
Expand All @@ -89,7 +89,7 @@ describe("Asset Tab", () => {
it("Import new asset", () => {
assetPage.selectassetimportbutton();
assetPage.selectImportOption();
assetPage.selectImportFacility("Dummy Facility 1");
assetPage.selectImportFacility("Dummy Facility 40");
assetPage.importAssetFile();
assetPage.selectImportLocation("Camera Loc");
assetPage.clickImportAsset();
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/assets_spec/assets_creation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe("Asset", () => {

it("Verify asset creation fields throws error if empty", () => {
assetPage.createAsset();
assetPage.selectFacility("Dummy Facility 1");
assetPage.selectFacility("Dummy Facility 40");
assetPage.clickCreateAsset();

assetPage.verifyEmptyAssetNameError();
Expand All @@ -39,7 +39,7 @@ describe("Asset", () => {

it("Create an Asset", () => {
assetPage.createAsset();
assetPage.selectFacility("Dummy Facility 1");
assetPage.selectFacility("Dummy Facility 40");
assetPage.selectLocation("Camera Loc");
assetPage.selectAssetType("Internal");
assetPage.selectAssetClass("ONVIF Camera");
Expand Down Expand Up @@ -139,7 +139,7 @@ describe("Asset", () => {

it("Add an vital monitor asset and configure it", () => {
assetPage.createAsset();
assetPage.selectFacility("Dummy Facility 1");
assetPage.selectFacility("Dummy Facility 40");
assetPage.selectLocation("Camera Loc");
assetPage.selectAssetType("Internal");
assetPage.selectAssetClass("HL7 Vitals Monitor");
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/assets_spec/assets_manage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("Asset", () => {
const facilityPage = new FacilityPage();
const assetSearchPage = new AssetSearchPage();
const assetFilters = new AssetFilters();
const fillFacilityName = "Dummy Facility 1";
const fillFacilityName = "Dummy Facility 40";
const assetname = "Dummy Camera";
const locationName = "Dummy Location 1";
const initiallocationName = "Camera Location";
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/facility_creation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe("Facility Creation", () => {
const doctorCapacity = "5";
const totalDoctor = "10";
const facilityName = "cypress facility";
const facilityName2 = "Dummy Facility 1";
const facilityName2 = "Dummy Facility 40";
const facilityAddress = "cypress address";
const facilityUpdateAddress = "cypress updated address";
const facilityNumber = "9898469865";
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/facility_spec/facility_homepage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe("Facility Homepage Function", () => {
const capacitiesAlias = "downloadCapacitiesCSV";
const doctorsAlias = "downloadDoctorsCSV";
const triagesAlias = "downloadTriagesCSV";
const facilityName = "Dummy Facility 1";
const facilityName = "Dummy Facility 40";
const facilityLocaion = "Dummy Location";
const stateName = "Kerala";
const district = "Ernakulam";
Expand Down
17 changes: 16 additions & 1 deletion cypress/e2e/facility_spec/locations.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,20 @@ describe("Location Management Section", () => {

it("Add a Bed to facility location along with duplication and deleting a bed", () => {
// mandatory field verification in bed creation
facilityLocation.clickManageBedButton();
cy.get("body").then(($body) => {
if ($body.find("#manage-bed-button:visible").length) {
// If the '#manage-bed-button' is visible
facilityLocation.clickManageBedButton();
} else {
// If the '#manage-bed-button' is not visible
facilityLocation.clickAddNewLocationButton();
facilityPage.fillFacilityName(locationName);
facilityLocation.selectLocationType(locationType);
assetPage.clickassetupdatebutton();
facilityLocation.clickNotification();
facilityLocation.clickManageBedButton();
}
});
facilityLocation.clickAddBedButton();
assetPage.clickassetupdatebutton();
userCreationPage.verifyErrorMessages(EXPECTED_BED_ERROR_MESSAGES);
Expand Down Expand Up @@ -102,6 +115,7 @@ describe("Location Management Section", () => {
facilityLocation.selectLocationType(locationType);
facilityLocation.fillMiddlewareAddress(locationMiddleware);
assetPage.clickassetupdatebutton();
facilityLocation.clickNotification();
// verify the reflection
facilityLocation.verifyLocationName(locationName);
facilityLocation.verifyLocationType(locationType);
Expand Down Expand Up @@ -130,6 +144,7 @@ describe("Location Management Section", () => {
facilityLocation.selectBedType(bedType);
facilityLocation.setMultipleBeds(numberOfBeds);
assetPage.clickassetupdatebutton();
facilityLocation.clickNotification();
// verify the bed creation
facilityLocation.verifyBedBadge(bedType);
facilityLocation.verifyBedBadge(bedStatus);
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/patient_crud.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe("Patient Creation with consultation", () => {

it("Create a new patient with no consultation", () => {
patientPage.createPatient();
patientPage.selectFacility("dummy facility");
patientPage.selectFacility("dummy facility 40");
patientPage.patientformvisibility();
patientPage.enterPatientDetails(
phone_number,
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/resource_spec/filter.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe("Resource filter", () => {
cy.intercept(/\/api\/v1\/getallfacilities/).as("facilities_filter");
cy.contains("Filters").click();
cy.get("[name='origin_facility']")
.type("Dummy Facility 1")
.type("Dummy Facility 40")
.wait("@facilities_filter");
cy.get("[role='option']").first().click();
cy.contains("Apply").click();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/resource_spec/resources.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe("Resource Page", () => {

it("Create a resource request", () => {
cy.visit("/facility");
cy.get("#search").click().type("dummy facility 1");
cy.get("#search").click().type("dummy facility 40");
cy.intercept("GET", "**/api/v1/facility/**").as("loadFacilities");
cy.get("#facility-details").click();
cy.wait("@loadFacilities").its("response.statusCode").should("eq", 200);
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/users_spec/user_creation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe("User Creation", () => {
const userCreationPage = new UserCreationPage();
const facilityPage = new FacilityPage();
const assetSearchPage = new AssetSearchPage();
const fillFacilityName = "Dummy Facility 1";
const fillFacilityName = "Dummy Facility 40";
const makeid = (length: number) => {
let result = "";
const characters = "abcdefghijklmnopqrstuvwxyz0123456789";
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/users_spec/user_manage.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe("Manage User", () => {
const usernameforworkinghour = "devdistrictadmin";
const usernamerealname = "Dummy Doctor";
const facilitytolinkusername = "Dummy Shifting Center";
const facilitytolinkskill = "Dummy Facility 1";
const facilitytolinkskill = "Dummy Facility 40";
const workinghour = "23";
const linkedskill = "General Medicine";

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/users_spec/user_profile.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("Manage User Profile", () => {
const doctorYoE = "10";
const medicalCouncilRegistration = "1234567890";

const facilitySearch = "Dummy Facility 1";
const facilitySearch = "Dummy Facility 40";

before(() => {
loginPage.loginAsDevDoctor();
Expand Down
2 changes: 1 addition & 1 deletion cypress/pageobject/Facility/FacilityCreation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FacilityPage {
}

fillFacilityName(name: string) {
cy.get("#name").clear().type(name);
cy.get("#name").click().clear().click().type(name);
}

fillPincode(pincode: string) {
Expand Down
4 changes: 4 additions & 0 deletions cypress/pageobject/Facility/FacilityLocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ class FacilityLocation {
cy.get("#add-new-bed").click();
}

clickNotification() {
cy.get(".pnotify").click();
}

enterBedName(name: string) {
cy.get("#bed-name").click().clear().click().type(name);
}
Expand Down
Loading