Add latest changes from gitlab-org/gitlab@master

4 files changed, 26 insertions, 23 deletions

diff --git a/qa/qa/page/component/select2.rb b/qa/qa/page/component/select2.rb
index b8beb64b6bd..761bbb17168 100644
--- a/qa/qa/page/component/select2.rb
+++ b/qa/qa/page/component/select2.rb
@@ -8,6 +8,10 @@ module QA
           find('.select2-result-label', text: item_text, match: :prefer_exact).click
         end
 
+        def has_item?(item_text)
+          has_css?('.select2-result-label', text: item_text, match: :prefer_exact)
+        end
+
         def current_selection
           find('.select2-chosen').text
         end
@@ -25,8 +29,12 @@ module QA
         end
 
         def search_and_select(item_text)
+          QA::Runtime::Logger.info "Searching and selecting: #{item_text}"
+
           search_item(item_text)
 
+          raise QA::Page::Base::ElementNotFound, %Q(Couldn't find option named "#{item_text}") unless has_item?(item_text)
+
           select_item(item_text)
         end
 
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 8431e47831e..0b80ba84fa4 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -53,10 +53,6 @@ module QA
           element :diffs_tab
         end
 
-        view 'app/assets/javascripts/diffs/components/diff_table_cell.vue' do
-          element :diff_comment
-        end
-
         view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do
           element :new_diff_line
         end
diff --git a/qa/qa/page/project/settings/advanced.rb b/qa/qa/page/project/settings/advanced.rb
index 960d6c221b5..97519c3906c 100644
--- a/qa/qa/page/project/settings/advanced.rb
+++ b/qa/qa/page/project/settings/advanced.rb
@@ -38,20 +38,16 @@ module QA
             click_element :change_path_button
           end
 
-          def select_transfer_option(namespace)
-            search_and_select(namespace)
-          end
-
           def transfer_project!(project_name, namespace)
-            # Retry added here due to seldom seen inconsistent UI state issue:
-            # https://gitlab.com/gitlab-org/gitlab/-/issues/231242
-            retry_on_exception do
-              click_element_coordinates(:archive_project_content)
-              expand_select_list
-              # Workaround for a failure to search when there are no spaces around the /
-              # https://gitlab.com/gitlab-org/gitlab/-/issues/218965
-              select_transfer_option(namespace.gsub(/([^\s])\/([^\s])/, '\1 / \2'))
-            end
+            QA::Runtime::Logger.info "Transferring project: #{project_name} to namespace: #{namespace}"
+
+            click_element_coordinates(:archive_project_content)
+
+            expand_select_list
+
+            # Workaround for a failure to search when there are no spaces around the /
+            # https://gitlab.com/gitlab-org/gitlab/-/issues/218965
+            search_and_select(namespace.gsub(/([^\s])\/([^\s])/, '\1 / \2'))
 
             click_element(:transfer_button)
             fill_confirmation_text(project_name)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
index 2334a5313b3..b9e1ee53246 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
@@ -11,14 +11,14 @@ module QA
 
       let(:target_group) do
         Resource::Group.fabricate_via_api! do |group|
-          group.path = 'target-group'
+          group.path = "target-group-for-transfer_#{SecureRandom.hex(8)}"
         end
       end
 
       let(:project) do
         Resource::Project.fabricate_via_api! do |project|
           project.group = source_group
-          project.name =  'transfer-project'
+          project.name = 'transfer-project'
           project.initialize_with_readme = true
         end
       end
@@ -44,12 +44,15 @@ module QA
       end
 
       it 'user transfers a project between groups', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/406' do
-        Page::File::Show.perform(&:go_to_general_settings)
+        # Retry is needed here as the target group is not avaliable for transfer right away.
+        QA::Support::Retrier.retry_on_exception(reload_page: page) do
+          Page::File::Show.perform(&:go_to_general_settings)
 
-        Page::Project::Settings::Main.perform(&:expand_advanced_settings)
+          Page::Project::Settings::Main.perform(&:expand_advanced_settings)
 
-        Page::Project::Settings::Advanced.perform do |advanced|
-          advanced.transfer_project!(project.name, target_group.full_path)
+          Page::Project::Settings::Advanced.perform do |advanced|
+            advanced.transfer_project!(project.name, target_group.full_path)
+          end
         end
 
         Page::Project::Settings::Main.perform(&:click_project)