Merge branch...

Merge branch '37304-transient-failure-in-qa-specs-features-browser_ui-3_create-merge_request' into 'master'

Fix previously failing create_merge_request_spec

Closes #37304

See merge request gitlab-org/gitlab!21445

app/views/shared/issuable/_sidebar.html.haml

@@ -33,7 +33,7 @@
         .block.milestone{ data: { qa_selector: 'milestone_block' } }
           .sidebar-collapsed-icon.has-tooltip{ title: sidebar_milestone_tooltip_label(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
             = icon('clock-o', 'aria-hidden': 'true')
-            %span.milestone-title.collapse-truncated-title{ data: { qa_selector: 'milestone_title' } }
+            %span.milestone-title.collapse-truncated-title
               - if milestone.present?
                 = milestone[:title]
               - else
@@ -45,7 +45,7 @@
               = link_to _('Edit'), '#', class: 'js-sidebar-dropdown-toggle edit-link float-right', data: { track_label: "right_sidebar", track_property: "milestone", track_event: "click_edit_button", track_value: "" }
           .value.hide-collapsed
             - if milestone.present?
-              = link_to milestone[:title], milestone[:web_url], class: "bold has-tooltip", title: sidebar_milestone_remaining_days(milestone), data: { container: "body", html: 'true', boundary: 'viewport', qa_selector: 'milestone_link' }
+              = link_to milestone[:title], milestone[:web_url], class: "bold has-tooltip", title: sidebar_milestone_remaining_days(milestone), data: { container: "body", html: 'true', boundary: 'viewport', qa_selector: 'milestone_link', qa_title: milestone[:title] }
             - else
               %span.no-value
                 = _('None')

qa/qa/page/issuable/sidebar.rb

@@ -7,7 +7,7 @@ module QA
         view 'app/views/shared/issuable/_sidebar.html.haml' do
           element :labels_block
           element :milestone_block
-          element :milestone_title
+          element :milestone_link
         end
 
         def has_label?(label)
@@ -16,9 +16,9 @@ module QA
           end
         end
 
-        def has_milestone?(milestone)
+        def has_milestone?(milestone_title)
           within_element(:milestone_block) do
-            has_element?(:milestone_title, text: milestone)
+            has_element?(:milestone_link, title: milestone_title)
           end
         end
       end

qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb

@@ -27,8 +27,7 @@ module QA
         end
       end
 
-      # Failure issue (in master): https://gitlab.com/gitlab-org/gitlab/issues/37304
-      it 'creates a merge request with a milestone and label', :quarantine do
+      it 'creates a merge request with a milestone and label' do
         gitlab_account_username = "@#{Runtime::User.username}"
 
         milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|