Merge branch 'develop' into doctor-notes-enhancement

UdaySagar-Git · Dec 11, 2024 · af5d5aa · af5d5aa
2 parents b910707 + 1f173e8
commit af5d5aa
Show file tree

Hide file tree

Showing 69 changed files with 5,212 additions and 2,894 deletions.
diff --git a/cypress/e2e/users_spec/UsersCreation.cy.ts b/cypress/e2e/users_spec/UsersCreation.cy.ts
@@ -43,7 +43,7 @@ describe("User Creation", () => {
     "Please enter valid phone number",
     "Please enter the username",
     "Please enter date in DD/MM/YYYY format",
-    "Please enter the password",
+    "Password is required",
     "Confirm password is required",
     "First Name is required",
     "Last Name is required",
@@ -164,13 +164,10 @@ describe("User Creation", () => {
     cy.verifyNotification("User added successfully");
     userPage.typeInSearchInput(username);
     userPage.checkUsernameText(username);
-    cy.verifyContentPresence("#name", [newUserFirstName]);
+    cy.verifyContentPresence(`#name-${username}`, [newUserFirstName]);
     cy.verifyContentPresence("#role", [role]);
     cy.verifyContentPresence("#district", [district]);
-    cy.verifyContentPresence("#home_facility", [homeFacility]);
-    cy.verifyContentPresence("#qualification", [qualification]);
-    cy.verifyContentPresence("#doctor-experience", [experience]);
-    cy.verifyContentPresence("#medical-council-registration", [regNo]);
+    cy.verifyContentPresence("#home-facility", [homeFacility]);
   });
 
   it("create new user form throwing mandatory field error", () => {

diff --git a/cypress/e2e/users_spec/UsersHomepage.cy.ts b/cypress/e2e/users_spec/UsersHomepage.cy.ts
@@ -89,6 +89,18 @@ describe("User Homepage", () => {
     pageNavigation.verifyCurrentPageNumber(1);
   });
 
+  it("Switch to list view, search by username and verify the results", () => {
+    userPage.switchToListView();
+    userPage.verifyListView();
+    userPage.checkSearchInputVisibility();
+    userPage.typeInSearchInput(doctorUserName);
+    userPage.checkUrlForUsername(doctorUserName);
+    userPage.checkUsernameText(doctorUserName);
+    userPage.checkUsernameBadgeVisibility(true);
+    userPage.clearSearchInput();
+    userPage.verifyListView();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });

diff --git a/cypress/e2e/users_spec/UsersManage.cy.ts b/cypress/e2e/users_spec/UsersManage.cy.ts
diff --git a/cypress/pageobject/Login/LoginPage.ts b/cypress/pageobject/Login/LoginPage.ts
@@ -19,9 +19,11 @@ class LoginPage {
     cy.clickSubmitButton("Login");
   }
 
-  loginManuallyAsNurse(): void {
+  loginManuallyAsNurse(password?: string): void {
     cy.get("input[id='username']").click().type("dummynurse1");
-    cy.get("input[id='password']").click().type("Coronasafe@123");
+    cy.get("input[id='password']")
+      .click()
+      .type(password || "Coronasafe@123");
     cy.clickSubmitButton("Login");
   }