Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 3 deletions

diff --git a/qa/qa/page/group/menu.rb b/qa/qa/page/group/menu.rb
index 157bc3abaf6..2850382b672 100644
--- a/qa/qa/page/group/menu.rb
+++ b/qa/qa/page/group/menu.rb
@@ -83,7 +83,9 @@ module QA
           end
         end
 
-        def go_to_dependency_proxy
+        def go_to_group_dependency_proxy
+          return go_to_dependency_proxy if Runtime::Env.super_sidebar_enabled?
+
           hover_group_packages do
             within_submenu do
               click_element(:sidebar_menu_item_link, menu_item: 'Dependency Proxy')
diff --git a/qa/qa/page/sub_menus/super_sidebar/operate.rb b/qa/qa/page/sub_menus/super_sidebar/operate.rb
index 1ffbb6872da..00f3fb368b3 100644
--- a/qa/qa/page/sub_menus/super_sidebar/operate.rb
+++ b/qa/qa/page/sub_menus/super_sidebar/operate.rb
@@ -16,7 +16,7 @@ module QA
           end
 
           def go_to_dependency_proxy
-            open_operate_submenu('Dependency proxy')
+            open_operate_submenu('Dependency Proxy')
           end
 
           private
diff --git a/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb b/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb
index a0d283fd7ad..7e99cdba369 100644
--- a/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb
@@ -186,7 +186,7 @@ module QA
 
           project.group.visit!
 
-          Page::Group::Menu.perform(&:go_to_dependency_proxy)
+          Page::Group::Menu.perform(&:go_to_group_dependency_proxy)
 
           Page::Group::DependencyProxy.perform do |index|
             expect(index).to have_blob_count("Contains 1 blobs of images")