Merge branch 'develop' into fix#6560

ohcnetwork · Nov 11, 2023 · 2f1d4e7 · 2f1d4e7
2 parents 20fb542 + 7e50f8a
commit 2f1d4e7
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 381 deletions.
diff --git a/cypress/e2e/shifting_spec/filter.cy.ts b/cypress/e2e/shifting_spec/filter.cy.ts
@@ -19,7 +19,7 @@ describe("Shifting section filter", () => {
     shiftingPage.filterByFacility(
       "Dummy Shifting",
       "Dummy Shifting",
-      "District Admin"
+      "District"
     );
 
     shiftingPage.facilityAssignedBadge().should("exist");

diff --git a/cypress/e2e/users_spec/user_manage.cy.ts b/cypress/e2e/users_spec/user_manage.cy.ts
@@ -2,6 +2,7 @@ import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { UserPage } from "../../pageobject/Users/UserSearch";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
+import { UserCreationPage } from "../../pageobject/Users/UserCreation";
 
 describe("Manage User", () => {
   const loginPage = new LoginPage();
@@ -11,6 +12,7 @@ describe("Manage User", () => {
   const usernametolinkfacilitydoc2 = "dummydoctor5";
   const usernametolinkfacilitydoc3 = "dummydoctor6";
   const usernametolinkskill = "devdoctor";
+  const userCreationPage = new UserCreationPage();
   const usernameforworkinghour = "devdistrictadmin";
   const usernamerealname = "Dummy Doctor";
   const facilitytolinkusername = "Dummy Shifting Center";
@@ -37,7 +39,16 @@ describe("Manage User", () => {
     manageUserPage.selectFacilityFromDropdown(linkedskill);
     manageUserPage.clickAddSkillButton();
     manageUserPage.clickCloseSlideOver();
+    cy.wait(5000);
+    manageUserPage.clicklinkedskillbutton();
+    manageUserPage.assertSkillInAddedUserSkills(linkedskill);
+    manageUserPage.clickCloseSlideOver();
+    cy.wait(5000);
     manageUserPage.navigateToProfile();
+    userCreationPage.verifyElementContainsText(
+      "username-profile-details",
+      usernameforworkinghour
+    );
     manageUserPage.assertSkillInAlreadyLinkedSkills(linkedskill);
   });
 

diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
@@ -73,7 +73,9 @@ export class ManageUserPage {
   }
 
   navigateToProfile() {
+    cy.intercept("GET", "**/api/v1/users/**").as("getUsers");
     cy.get("#profilenamelink").click();
+    cy.wait("@getUsers").its("response.statusCode").should("eq", 200);
   }
 
   verifyWorkingHours(expectedHours: string) {