diff options
Diffstat (limited to 'qa/qa/page/group')
| -rw-r--r-- | qa/qa/page/group/bulk_import.rb | 8 | ||||
| -rw-r--r-- | qa/qa/page/group/dependency_proxy.rb | 26 | ||||
| -rw-r--r-- | qa/qa/page/group/members.rb | 2 | ||||
| -rw-r--r-- | qa/qa/page/group/menu.rb | 110 | ||||
| -rw-r--r-- | qa/qa/page/group/settings/billing.rb | 13 |
5 files changed, 101 insertions, 58 deletions
diff --git a/qa/qa/page/group/bulk_import.rb b/qa/qa/page/group/bulk_import.rb index a0511c9a16c..9ba80abf21c 100644 --- a/qa/qa/page/group/bulk_import.rb +++ b/qa/qa/page/group/bulk_import.rb @@ -6,13 +6,13 @@ module QA class BulkImport < Page::Base view "app/assets/javascripts/import_entities/import_groups/components/import_table.vue" do element :import_table + element :import_item + element :import_group_button + element :import_status_indicator end - view "app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue" do - element :import_item + view "app/assets/javascripts/import_entities/import_groups/components/import_target_cell.vue" do element :target_group_dropdown_item - element :import_status_indicator - element :import_group_button end view "app/assets/javascripts/import_entities/components/group_dropdown.vue" do diff --git a/qa/qa/page/group/dependency_proxy.rb b/qa/qa/page/group/dependency_proxy.rb new file mode 100644 index 00000000000..f637c79cffc --- /dev/null +++ b/qa/qa/page/group/dependency_proxy.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module QA + module Page + module Group + class DependencyProxy < QA::Page::Base + view 'app/views/groups/dependency_proxies/show.html.haml' do + element :dependency_proxy_setting_toggle + end + + view 'app/views/groups/dependency_proxies/_url.html.haml' do + element :dependency_proxy_count + end + + def has_dependency_proxy_enabled? + toggle = find_element(:dependency_proxy_setting_toggle) + toggle[:class].include?('is-checked') + end + + def has_blob_count?(blob_text) + has_element?(:dependency_proxy_count, text: blob_text) + end + end + end + end +end diff --git a/qa/qa/page/group/members.rb b/qa/qa/page/group/members.rb index b526a4488b2..ccc901932f4 100644 --- a/qa/qa/page/group/members.rb +++ b/qa/qa/page/group/members.rb @@ -7,7 +7,7 @@ module QA include Page::Component::InviteMembersModal include Page::Component::UsersSelect - view 'app/assets/javascripts/vue_shared/components/remove_member_modal.vue' do + view 'app/assets/javascripts/members/components/modals/remove_member_modal.vue' do element :remove_member_modal_content end diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb index 338a135614d..c997598e25a 100644 --- a/qa/qa/page/group/menu.rb +++ b/qa/qa/page/group/menu.rb @@ -6,51 +6,32 @@ module QA class Menu < Page::Base include SubMenus::Common - view 'app/views/layouts/nav/sidebar/_group_menus.html.haml' do - element :general_settings_link - element :group_issues_item - element :group_members_item - element :group_milestones_link - element :group_settings - element :group_information_link - element :group_information_submenu - end - - view 'app/views/groups/sidebar/_packages_settings.html.haml' do - element :group_package_settings_link - end - - view 'app/views/layouts/nav/sidebar/_analytics_links.html.haml' do - element :analytics_link - element :analytics_sidebar_submenu - end - def click_group_members_item - hover_element(:group_information_link) do - within_submenu(:group_information_submenu) do - click_element(:group_members_item) + hover_group_information do + within_submenu do + click_element(:sidebar_menu_item_link, menu_item: 'Members') end end end - def click_settings - within_sidebar do - click_element(:group_settings) + def click_subgroup_members_item + hover_subgroup_information do + within_submenu do + click_element(:sidebar_menu_item_link, menu_item: 'Members') + end end end - def click_contribution_analytics_item - hover_element(:analytics_link) do - within_submenu(:analytics_sidebar_submenu) do - click_element(:contribution_analytics_link) - end + def click_settings + within_sidebar do + click_element(:sidebar_menu_link, menu_item: 'Settings') end end def click_group_general_settings_item - hover_element(:group_settings) do - within_submenu(:group_sidebar_submenu) do - click_element(:general_settings_link) + hover_group_settings do + within_submenu do + click_element(:sidebar_menu_item_link, menu_item: 'General') end end end @@ -58,16 +39,31 @@ module QA def go_to_milestones hover_issues do within_submenu do - click_element(:group_milestones_link) + click_element(:sidebar_menu_item_link, menu_item: 'Milestones') end end end def go_to_package_settings - scroll_to_element(:group_settings) - hover_element(:group_settings) do - within_submenu(:group_sidebar_submenu) do - click_element(:group_package_settings_link) + hover_group_settings do + within_submenu do + click_element(:sidebar_menu_item_link, menu_item: 'Packages & Registries') + end + end + end + + def go_to_group_packages + hover_group_packages do + within_submenu do + click_element(:sidebar_menu_item_link, menu_item: 'Package Registry') + end + end + end + + def go_to_dependency_proxy + hover_group_packages do + within_submenu do + click_element(:sidebar_menu_item_link, menu_item: 'Dependency Proxy') end end end @@ -76,8 +72,42 @@ module QA def hover_issues within_sidebar do - scroll_to_element(:group_issues_item) - find_element(:group_issues_item).hover + scroll_to_element(:sidebar_menu_link, menu_item: 'Issues') + find_element(:sidebar_menu_link, menu_item: 'Issues').hover + + yield + end + end + + def hover_group_information + within_sidebar do + find_element(:sidebar_menu_link, menu_item: 'Group information').hover + + yield + end + end + + def hover_subgroup_information + within_sidebar do + find_element(:sidebar_menu_link, menu_item: 'Subgroup information').hover + + yield + end + end + + def hover_group_packages + within_sidebar do + scroll_to_element(:sidebar_menu_link, menu_item: 'Packages & Registries') + find_element(:sidebar_menu_link, menu_item: 'Packages & Registries').hover + + yield + end + end + + def hover_group_settings + within_sidebar do + scroll_to_element(:sidebar_menu_link, menu_item: 'Settings') + find_element(:sidebar_menu_link, menu_item: 'Settings').hover yield end diff --git a/qa/qa/page/group/settings/billing.rb b/qa/qa/page/group/settings/billing.rb deleted file mode 100644 index a83af47fc35..00000000000 --- a/qa/qa/page/group/settings/billing.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module QA - module Page - module Group - module Settings - class Billing < Chemlab::Page - link :start_your_free_trial - end - end - end - end -end |