Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

8 files changed, 35 insertions, 25 deletions

diff --git a/qa/qa/page/component/clone_panel.rb b/qa/qa/page/component/clone_panel.rb
index a0aea6fe44d..3ea29ff63da 100644
--- a/qa/qa/page/component/clone_panel.rb
+++ b/qa/qa/page/component/clone_panel.rb
@@ -11,18 +11,18 @@ module QA
 
           base.view 'app/views/projects/buttons/_clone.html.haml' do
             element :clone_dropdown
-            element :clone_options
-            element :ssh_clone_url
-            element :http_clone_url
+            element :clone_dropdown_content
+            element :ssh_clone_url_content
+            element :http_clone_url_content
           end
         end
 
         def repository_clone_http_location
-          repository_clone_location(:http_clone_url)
+          repository_clone_location(:http_clone_url_content)
         end
 
         def repository_clone_ssh_location
-          repository_clone_location(:ssh_clone_url)
+          repository_clone_location(:ssh_clone_url_content)
         end
 
         private
@@ -31,7 +31,7 @@ module QA
           wait_until(reload: false) do
             click_element :clone_dropdown
 
-            within_element :clone_options do
+            within_element :clone_dropdown_content do
               Git::Location.new(find_element(kind).value)
             end
           end
diff --git a/qa/qa/page/component/content_editor.rb b/qa/qa/page/component/content_editor.rb
index f7b055b6052..e9fc575ae39 100644
--- a/qa/qa/page/component/content_editor.rb
+++ b/qa/qa/page/component/content_editor.rb
@@ -22,8 +22,8 @@ module QA
             element :file_upload_field
           end
 
-          base.view 'app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue' do
-            element :wiki_hidden_content
+          base.view 'app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue' do
+            element :markdown_editor_form_field
           end
         end
 
@@ -47,7 +47,7 @@ module QA
           end
 
           QA::Support::Retrier.retry_on_exception do
-            source = find_element(:wiki_hidden_content, visible: false)
+            source = find_element(:markdown_editor_form_field, visible: false)
             source.value =~ %r{uploads/.*#{::File.basename(image_path)}}
           end
         end
diff --git a/qa/qa/page/component/groups_filter.rb b/qa/qa/page/component/groups_filter.rb
index ff61c91f0f6..28b8ece918d 100644
--- a/qa/qa/page/component/groups_filter.rb
+++ b/qa/qa/page/component/groups_filter.rb
@@ -9,7 +9,7 @@ module QA
         def self.included(base)
           super
 
-          base.view 'app/views/shared/groups/_search_form.html.haml' do
+          base.view 'app/assets/javascripts/groups/components/overview_tabs.vue' do
             element :groups_filter_field
           end
 
diff --git a/qa/qa/page/component/invite_members_modal.rb b/qa/qa/page/component/invite_members_modal.rb
index 5c39cfd3695..27dce152367 100644
--- a/qa/qa/page/component/invite_members_modal.rb
+++ b/qa/qa/page/component/invite_members_modal.rb
@@ -62,13 +62,9 @@ module QA
 
             Support::Waiter.wait_until { has_element?(:group_select_dropdown_item) }
 
-            # Workaround for race condition with concurrent group API calls while searching
-            # Remove Retrier after https://gitlab.com/gitlab-org/gitlab/-/issues/349379 is resolved
-            Support::Retrier.retry_on_exception do
-              fill_element :group_select_dropdown_search_field, group_name
-              Support::WaitForRequests.wait_for_requests
-              click_button group_name
-            end
+            fill_element :group_select_dropdown_search_field, group_name
+            Support::WaitForRequests.wait_for_requests
+            click_button group_name
 
             set_access_level(access_level)
           end
diff --git a/qa/qa/page/component/issuable/sidebar.rb b/qa/qa/page/component/issuable/sidebar.rb
index 68da89dc81d..71a69576c06 100644
--- a/qa/qa/page/component/issuable/sidebar.rb
+++ b/qa/qa/page/component/issuable/sidebar.rb
@@ -18,6 +18,10 @@ module QA
               element :more_assignees_link
             end
 
+            base.view 'app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue' do
+              element :reviewers_edit_button
+            end
+
             base.view 'app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue' do
               element :labels_block
             end
@@ -37,6 +41,7 @@ module QA
             base.view 'app/views/shared/issuable/_sidebar.html.haml' do
               element :assignee_block_container
               element :milestone_block
+              element :reviewers_block_container
             end
 
             base.view 'app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue' do
@@ -46,6 +51,10 @@ module QA
             base.view 'app/assets/javascripts/sidebar/components/sidebar_editable_item.vue' do
               element :edit_link
             end
+
+            base.view 'app/helpers/dropdowns_helper.rb' do
+              element :dropdown_list_content
+            end
           end
 
           def assign_milestone(milestone)
diff --git a/qa/qa/page/component/legacy_clone_panel.rb b/qa/qa/page/component/legacy_clone_panel.rb
index f15d159a712..ee372a3f9aa 100644
--- a/qa/qa/page/component/legacy_clone_panel.rb
+++ b/qa/qa/page/component/legacy_clone_panel.rb
@@ -11,8 +11,8 @@ module QA
 
           base.view 'app/views/shared/_clone_panel.html.haml' do
             element :clone_dropdown
-            element :clone_options_dropdown, '.clone-options-dropdown' # rubocop:disable QA/ElementWithPattern
-            element :clone_url, 'text_field_tag :clone_url' # rubocop:disable QA/ElementWithPattern
+            element :clone_dropdown_content
+            element :clone_url_content
           end
         end
 
@@ -28,7 +28,7 @@ module QA
         end
 
         def repository_location
-          Git::Location.new(find('#clone_url').value)
+          Git::Location.new(find_element(:clone_url_content).text)
         end
 
         private
@@ -37,7 +37,7 @@ module QA
           wait_until(reload: false) do
             click_element :clone_dropdown
 
-            page.within('.clone-options-dropdown') do
+            within_element(:clone_dropdown_content) do
               click_link(kind)
             end
 
diff --git a/qa/qa/page/component/namespace_select.rb b/qa/qa/page/component/namespace_select.rb
index 4dbcb39ced6..9b483162f1b 100644
--- a/qa/qa/page/component/namespace_select.rb
+++ b/qa/qa/page/component/namespace_select.rb
@@ -9,7 +9,7 @@ module QA
         def self.included(base)
           super
 
-          base.view "app/assets/javascripts/vue_shared/components/namespace_select/namespace_select.vue" do
+          base.view "app/assets/javascripts/vue_shared/components/namespace_select/namespace_select_deprecated.vue" do
             element :namespaces_list
             element :namespaces_list_groups
             element :namespaces_list_item
@@ -20,8 +20,10 @@ module QA
         def select_namespace(item)
           click_element :namespaces_list
 
+          wait_for_requests
+
           within_element(:namespaces_list) do
-            find_element(:namespaces_list_search).fill_in(with: item)
+            fill_element(:namespaces_list_search, item)
 
             wait_for_requests
 
diff --git a/qa/qa/page/component/wiki_page_form.rb b/qa/qa/page/component/wiki_page_form.rb
index 9e558844469..7a7329e6110 100644
--- a/qa/qa/page/component/wiki_page_form.rb
+++ b/qa/qa/page/component/wiki_page_form.rb
@@ -11,9 +11,12 @@ module QA
 
           base.view 'app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue' do
             element :wiki_title_textbox
-            element :wiki_content_textarea
             element :wiki_message_textbox
             element :wiki_submit_button
+          end
+
+          base.view 'app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue' do
+            element :markdown_editor_form_field
             element :editing_mode_button
           end
 
@@ -27,7 +30,7 @@ module QA
         end
 
         def set_content(content)
-          fill_element(:wiki_content_textarea, content)
+          fill_element(:markdown_editor_form_field, content)
         end
 
         def set_message(message)