diff options
Diffstat (limited to 'qa/qa/page/group/show.rb')
| -rw-r--r-- | qa/qa/page/group/show.rb | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb index 7639def98b7..38d919be4db 100644 --- a/qa/qa/page/group/show.rb +++ b/qa/qa/page/group/show.rb @@ -7,11 +7,8 @@ module QA include Page::Component::GroupsFilter view 'app/views/groups/_home_panel.html.haml' do - element :new_project_or_subgroup_dropdown - element :new_project_or_subgroup_dropdown_toggle - element :new_project_option - element :new_subgroup_option - element :new_in_group_button + element :new_project_button + element :new_subgroup_button end view 'app/assets/javascripts/groups/constants.js' do @@ -26,8 +23,9 @@ module QA click_link name end - def has_new_project_or_subgroup_dropdown? - has_element?(:new_project_or_subgroup_dropdown) + def has_new_project_and_new_subgroup_buttons? + has_element?(:new_project_button) + has_element?(:new_subgroup_button) end def has_subgroup?(name) @@ -35,15 +33,11 @@ module QA end def go_to_new_subgroup - select_kind :new_subgroup_option - - click_element :new_in_group_button + click_element :new_subgroup_button end def go_to_new_project - select_kind :new_project_option - - click_element :new_in_group_button + click_element :new_project_button end def leave_group @@ -51,23 +45,6 @@ module QA click_element :leave_group_link end end - - private - - def select_kind(kind) - QA::Support::Retrier.retry_on_exception(sleep_interval: 1.0) do - within_element(:new_project_or_subgroup_dropdown) do - # May need to click again because it is possible to click the button quicker than the JS is bound - wait_until(reload: false) do - click_element :new_project_or_subgroup_dropdown_toggle - - has_element?(kind) - end - - click_element kind - end - end - end end end end |