Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 14 deletions

diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index b89e17910c9..b5fce559496 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -9,6 +9,7 @@ module QA
         include Page::Component::Breadcrumbs
         include Page::Project::SubMenus::Settings
         include Page::File::Shared::CommitMessage
+        include ::QA::Page::Component::Dropdown
         prepend Mobile::Page::Project::Show if Runtime::Env.mobile_layout?
 
         view 'app/assets/javascripts/repository/components/preview/index.vue' do
@@ -68,11 +69,6 @@ module QA
           element :web_ide_button
         end
 
-        view 'app/views/shared/_ref_switcher.html.haml' do
-          element :branches_dropdown
-          element :branches_dropdown_content
-        end
-
         view 'app/views/projects/blob/viewers/_loading.html.haml' do
           element :spinner_placeholder
         end
@@ -184,11 +180,8 @@ module QA
         end
 
         def switch_to_branch(branch_name)
-          find_element(:branches_dropdown).click
-
-          within_element(:branches_dropdown_content) do
-            click_on branch_name
-          end
+          expand_select_list
+          select_item(branch_name)
         end
 
         def wait_for_import
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb
index b98bb8592d3..679f273d0f4 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb
@@ -2,10 +2,7 @@
 
 module QA
   RSpec.describe 'Create' do
-    describe 'Branch with unusual name', product_group: :source_code, quarantine: {
-      issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/364565',
-      type: :bug
-    } do
+    describe 'Branch with unusual name', product_group: :source_code do
       let(:branch_name) { 'unUsually/named#br--anch' }
       let(:project) do
         Resource::Project.fabricate_via_api! do |resource|