diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /qa/qa/page/admin | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'qa/qa/page/admin')
-rw-r--r-- | qa/qa/page/admin/menu.rb | 14 | ||||
-rw-r--r-- | qa/qa/page/admin/settings/general.rb | 4 | ||||
-rw-r--r-- | qa/qa/page/admin/settings/metrics_and_profiling.rb | 4 | ||||
-rw-r--r-- | qa/qa/page/admin/settings/network.rb | 8 | ||||
-rw-r--r-- | qa/qa/page/admin/settings/repository.rb | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb index da716ca8e27..37275465221 100644 --- a/qa/qa/page/admin/menu.rb +++ b/qa/qa/page/admin/menu.rb @@ -6,7 +6,7 @@ module QA class Menu < Page::Base view 'app/views/layouts/nav/sidebar/_admin.html.haml' do element :admin_sidebar - element :admin_sidebar_settings_submenu + element :admin_sidebar_settings_submenu_content element :admin_settings_item element :admin_settings_repository_item element :admin_settings_general_item @@ -22,7 +22,7 @@ module QA def go_to_preferences_settings hover_element(:admin_settings_item) do - within_submenu(:admin_sidebar_settings_submenu) do + within_submenu(:admin_sidebar_settings_submenu_content) do click_element :admin_settings_preferences_link end end @@ -30,7 +30,7 @@ module QA def go_to_repository_settings hover_element(:admin_settings_item) do - within_submenu(:admin_sidebar_settings_submenu) do + within_submenu(:admin_sidebar_settings_submenu_content) do click_element :admin_settings_repository_item end end @@ -38,7 +38,7 @@ module QA def go_to_integration_settings hover_element(:admin_settings_item) do - within_submenu(:admin_sidebar_settings_submenu) do + within_submenu(:admin_sidebar_settings_submenu_content) do click_element :integration_settings_link end end @@ -46,7 +46,7 @@ module QA def go_to_general_settings hover_element(:admin_settings_item) do - within_submenu(:admin_sidebar_settings_submenu) do + within_submenu(:admin_sidebar_settings_submenu_content) do click_element :admin_settings_general_item end end @@ -54,7 +54,7 @@ module QA def go_to_metrics_and_profiling_settings hover_element(:admin_settings_item) do - within_submenu(:admin_sidebar_settings_submenu) do + within_submenu(:admin_sidebar_settings_submenu_content) do click_element :admin_settings_metrics_and_profiling_item end end @@ -62,7 +62,7 @@ module QA def go_to_network_settings hover_element(:admin_settings_item) do - within_submenu(:admin_sidebar_settings_submenu) do + within_submenu(:admin_sidebar_settings_submenu_content) do click_element :admin_settings_network_item end end diff --git a/qa/qa/page/admin/settings/general.rb b/qa/qa/page/admin/settings/general.rb index 150775f57d2..7e35902a778 100644 --- a/qa/qa/page/admin/settings/general.rb +++ b/qa/qa/page/admin/settings/general.rb @@ -8,11 +8,11 @@ module QA include QA::Page::Settings::Common view 'app/views/admin/application_settings/general.html.haml' do - element :account_and_limit_settings + element :account_and_limit_settings_content end def expand_account_and_limit(&block) - expand_section(:account_and_limit_settings) do + expand_content(:account_and_limit_settings_content) do Component::AccountAndLimit.perform(&block) end end diff --git a/qa/qa/page/admin/settings/metrics_and_profiling.rb b/qa/qa/page/admin/settings/metrics_and_profiling.rb index e10a92d7a54..41fad942fc4 100644 --- a/qa/qa/page/admin/settings/metrics_and_profiling.rb +++ b/qa/qa/page/admin/settings/metrics_and_profiling.rb @@ -8,11 +8,11 @@ module QA include QA::Page::Settings::Common view 'app/views/admin/application_settings/metrics_and_profiling.html.haml' do - element :performance_bar_settings + element :performance_bar_settings_content end def expand_performance_bar(&block) - expand_section(:performance_bar_settings) do + expand_content(:performance_bar_settings_content) do Component::PerformanceBar.perform(&block) end end diff --git a/qa/qa/page/admin/settings/network.rb b/qa/qa/page/admin/settings/network.rb index 83566d3d1ca..253904788e3 100644 --- a/qa/qa/page/admin/settings/network.rb +++ b/qa/qa/page/admin/settings/network.rb @@ -8,18 +8,18 @@ module QA include QA::Page::Settings::Common view 'app/views/admin/application_settings/network.html.haml' do - element :ip_limits_section - element :outbound_requests_section + element :ip_limits_content + element :outbound_requests_content end def expand_ip_limits(&block) - expand_section(:ip_limits_section) do + expand_content(:ip_limits_content) do Component::IpLimits.perform(&block) end end def expand_outbound_requests(&block) - expand_section(:outbound_requests_section) do + expand_content(:outbound_requests_content) do Component::OutboundRequests.perform(&block) end end diff --git a/qa/qa/page/admin/settings/repository.rb b/qa/qa/page/admin/settings/repository.rb index b7f1deb21bd..82321765e63 100644 --- a/qa/qa/page/admin/settings/repository.rb +++ b/qa/qa/page/admin/settings/repository.rb @@ -8,11 +8,11 @@ module QA include QA::Page::Settings::Common view 'app/views/admin/application_settings/repository.html.haml' do - element :repository_storage_settings + element :repository_storage_settings_content end def expand_repository_storage(&block) - expand_section(:repository_storage_settings) do + expand_content(:repository_storage_settings_content) do Component::RepositoryStorage.perform(&block) end end |