Merge branch 'develop' into issue/9374/Upgrade_cypress_ci_node_version

AdityaJ2305 · Dec 11, 2024 · 6b103f9 · 6b103f9
2 parents ddc98a8 + bd19bcb
commit 6b103f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cypress/e2e/users_spec/UsersManage.cy.ts b/cypress/e2e/users_spec/UsersManage.cy.ts
@@ -34,6 +34,7 @@ describe("Manage User", () => {
 
   beforeEach(() => {
     cy.restoreLocalStorage();
+    cy.viewport(1280, 720);
     cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/users");
   });
@@ -233,7 +234,7 @@ describe("Manage User", () => {
     cy.wait(500);
     manageUserPage.verifyLinkedSkillsTabPage();
     manageUserPage.selectSkillFromDropdown(linkedskill);
-    manageUserPage.clickAddSkillButton();
+    manageUserPage.clickAddSkillButton(usernameforworkinghour);
     cy.wait(500);
     manageUserPage.assertSkillInAddedUserSkills(linkedskill);
     cy.wait(500);
@@ -268,7 +269,7 @@ describe("Manage User", () => {
     manageUserPage.clickLinkedSkillTab();
     manageUserPage.verifyLinkedSkillsTabPage();
     manageUserPage.selectSkillFromDropdown(linkedskill);
-    manageUserPage.clickAddSkillButton();
+    manageUserPage.clickAddSkillButton(usernameToLinkSkill);
     cy.verifyNotification("Skill added successfully");
     cy.closeNotification();
     manageUserPage.assertSkillInAddedUserSkills(linkedskill);

diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
@@ -127,6 +127,7 @@ export class ManageUserPage {
   }
 
   clearProfessionalInfo() {
+    cy.get("input[name='weekly_working_hours']").scrollIntoView();
     cy.get("input[name='weekly_working_hours']").click().clear();
     cy.get("input[name='video_connect_link']").click().clear();
   }
@@ -180,6 +181,7 @@ export class ManageUserPage {
   }
 
   typeInWeeklyWorkingHours(hours: string) {
+    cy.get("input[name='weekly_working_hours']").scrollIntoView();
     cy.get("input[name='weekly_working_hours']").click().type(hours);
   }
 
@@ -191,6 +193,7 @@ export class ManageUserPage {
   }
 
   verifyWorkingHours(expectedHours: string) {
+    cy.get("input[name='weekly_working_hours']").scrollIntoView();
     cy.get("input[name='weekly_working_hours']").should("be.visible");
     cy.get("input[name='weekly_working_hours']").should(
       "have.value",
@@ -359,8 +362,8 @@ export class ManageUserPage {
     cy.get("[data-testid='user-delete-button']").click();
   }
 
-  clickAddSkillButton() {
-    cy.intercept("GET", "**/api/v1/skill/**").as("getSkills");
+  clickAddSkillButton(username: string) {
+    cy.intercept("GET", `**/api/v1/users/${username}/skill/**`).as("getSkills");
     cy.get("#add-skill-button").click();
     cy.wait("@getSkills").its("response.statusCode").should("eq", 200);
   }