From a99a9e9e6b81aeab77b572aea7fc8acf4c155485 Mon Sep 17 00:00:00 2001 From: Dombi Attila <83396+dombesz@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:31:51 +0200 Subject: [PATCH] Refactor team_planner.add_assignee method to include retry_block --- .../team_planner_context_menu_spec.rb | 4 +- .../spec/features/team_planner_create_spec.rb | 26 ++-------- .../spec/features/team_planner_dates_spec.rb | 6 +-- .../team_planner_project_include_spec.rb | 8 +--- .../spec/features/team_planner_spec.rb | 48 ++++--------------- ...eam_planner_subproject_constraints_spec.rb | 4 +- .../team_planner_user_interaction_spec.rb | 8 +--- .../features/team_planner_view_modes_spec.rb | 6 +-- 8 files changed, 20 insertions(+), 90 deletions(-) diff --git a/modules/team_planner/spec/features/team_planner_context_menu_spec.rb b/modules/team_planner/spec/features/team_planner_context_menu_spec.rb index 3054cd7ab240..6813a415f088 100644 --- a/modules/team_planner/spec/features/team_planner_context_menu_spec.rb +++ b/modules/team_planner/spec/features/team_planner_context_menu_spec.rb @@ -43,9 +43,7 @@ team_planner.visit! loading_indicator_saveguard - retry_block do - team_planner.add_assignee user - end + team_planner.add_assignee user team_planner.within_lane(user) do team_planner.expect_event work_package diff --git a/modules/team_planner/spec/features/team_planner_create_spec.rb b/modules/team_planner/spec/features/team_planner_create_spec.rb index 70de2980ba54..7bc0eee95ce5 100644 --- a/modules/team_planner/spec/features/team_planner_create_spec.rb +++ b/modules/team_planner/spec/features/team_planner_create_spec.rb @@ -77,11 +77,7 @@ team_planner.expect_assignee(user, present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name end it_behaves_like 'can create a new work package' @@ -119,23 +115,9 @@ team_planner.expect_assignee(other_user, present: false) team_planner.expect_assignee(third_user, present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add other_user.name - end - - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add third_user.name - end - - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee other_user.name + team_planner.add_assignee third_user.name + team_planner.add_assignee user.name end it_behaves_like 'can create a new work package' diff --git a/modules/team_planner/spec/features/team_planner_dates_spec.rb b/modules/team_planner/spec/features/team_planner_dates_spec.rb index e429e6b3b75d..50d521d2b9f3 100644 --- a/modules/team_planner/spec/features/team_planner_dates_spec.rb +++ b/modules/team_planner/spec/features/team_planner_dates_spec.rb @@ -41,11 +41,7 @@ team_planner.visit! team_planner.expect_empty_state - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name # Initially, in the "Work week" view, non working days are hidden expect(page).to have_css('.fc-day-mon') diff --git a/modules/team_planner/spec/features/team_planner_project_include_spec.rb b/modules/team_planner/spec/features/team_planner_project_include_spec.rb index 30391f5ef5a6..3d5a42ad9a7c 100644 --- a/modules/team_planner/spec/features/team_planner_project_include_spec.rb +++ b/modules/team_planner/spec/features/team_planner_project_include_spec.rb @@ -56,15 +56,11 @@ work_package_view.expect_assignee(other_user, present: false) retry_block do - work_package_view.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - work_package_view.select_user_to_add user.name + work_package_view.add_assignee user.name end retry_block do - work_package_view.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - work_package_view.select_user_to_add other_user.name + work_package_view.add_assignee other_user.name end work_package_view.expect_assignee user diff --git a/modules/team_planner/spec/features/team_planner_spec.rb b/modules/team_planner/spec/features/team_planner_spec.rb index e0d8a856a417..5e2b0c32d2b7 100644 --- a/modules/team_planner/spec/features/team_planner_spec.rb +++ b/modules/team_planner/spec/features/team_planner_spec.rb @@ -155,19 +155,11 @@ team_planner.expect_assignee(user, present: false) team_planner.expect_assignee(other_user, present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name team_planner.expect_empty_state(present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add other_user.name - end + team_planner.add_assignee other_user.name team_planner.expect_assignee user team_planner.expect_assignee other_user @@ -249,21 +241,13 @@ team_planner.expect_assignee(user, present: false) team_planner.expect_assignee(other_user, present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name team_planner.expect_empty_state(present: false) team_planner.expect_assignee(user) team_planner.expect_assignee(other_user, present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add other_user.name - end + team_planner.add_assignee other_user.name team_planner.expect_assignee(user) team_planner.expect_assignee(other_user) @@ -280,11 +264,7 @@ team_planner.expect_empty_state # Try one more time to make sure deleting the full filter didn't kill the functionality - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name team_planner.expect_assignee(user) team_planner.expect_assignee(other_user, present: false) @@ -293,11 +273,7 @@ it 'filters possible assignees correctly' do team_planner.visit! - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.search_user_to_add user_outside_project.name - end + team_planner.add_assignee user_outside_project.name expect(page).to have_css('.ng-option-disabled', text: "No items found") @@ -307,11 +283,7 @@ team_planner.expect_assignee(user) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.search_user_to_add user.name - end + team_planner.add_assignee user.name expect(page).to have_css('.ng-option-disabled', text: "No items found") end @@ -372,11 +344,7 @@ team_planner.expect_empty_state team_planner.expect_assignee(user, present: false) - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name team_planner.expect_empty_state(present: false) team_planner.expect_assignee user diff --git a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb index 5babad79c12b..c3ff5fc2a77b 100644 --- a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb +++ b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb @@ -58,9 +58,7 @@ team_planner.visit! team_planner.add_assignee user - retry_block do - team_planner.add_assignee other_user - end + team_planner.add_assignee other_user # Include the subproject project_include.toggle! diff --git a/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb b/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb index 457b26983add..460e46f86d52 100644 --- a/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb +++ b/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb @@ -79,9 +79,7 @@ team_planner.visit! team_planner.add_assignee user - retry_block do - team_planner.add_assignee other_user - end + team_planner.add_assignee other_user team_planner.within_lane(user) do team_planner.expect_event first_wp, present: false @@ -247,9 +245,7 @@ team_planner.visit! team_planner.add_assignee user - retry_block do - team_planner.add_assignee other_user - end + team_planner.add_assignee other_user end it 'allows neither dragging nor resizing any wp' do diff --git a/modules/team_planner/spec/features/team_planner_view_modes_spec.rb b/modules/team_planner/spec/features/team_planner_view_modes_spec.rb index e7e786cc3554..56ded17546f8 100644 --- a/modules/team_planner/spec/features/team_planner_view_modes_spec.rb +++ b/modules/team_planner/spec/features/team_planner_view_modes_spec.rb @@ -36,11 +36,7 @@ team_planner.visit! team_planner.expect_empty_state - retry_block do - team_planner.click_add_user - page.find("#{test_selector('tp-add-assignee')} input") - team_planner.select_user_to_add user.name - end + team_planner.add_assignee user.name team_planner.expect_view_mode 'Work week' expect(page).to have_css('.fc-timeline-slot-frame', count: 5)