Commit b4a4b133 authored by Mark Lapierre's avatar Mark Lapierre
Browse files

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
parents bfa70377 7b84905b
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
.block.milestone{ data: { qa_selector: 'milestone_block' } } .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' } } .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') = 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? - if milestone.present?
= milestone[:title] = milestone[:title]
- else - else
...@@ -45,7 +45,7 @@ ...@@ -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: "" } = 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 .value.hide-collapsed
- if milestone.present? - 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 - else
%span.no-value %span.no-value
= _('None') = _('None')
......
...@@ -7,7 +7,7 @@ module QA ...@@ -7,7 +7,7 @@ module QA
view 'app/views/shared/issuable/_sidebar.html.haml' do view 'app/views/shared/issuable/_sidebar.html.haml' do
element :labels_block element :labels_block
element :milestone_block element :milestone_block
element :milestone_title element :milestone_link
end end
   
def has_label?(label) def has_label?(label)
...@@ -16,9 +16,9 @@ module QA ...@@ -16,9 +16,9 @@ module QA
end end
end end
   
def has_milestone?(milestone) def has_milestone?(milestone_title)
within_element(:milestone_block) do within_element(:milestone_block) do
has_element?(:milestone_title, text: milestone) has_element?(:milestone_link, title: milestone_title)
end end
end end
end end
......
...@@ -27,8 +27,7 @@ module QA ...@@ -27,8 +27,7 @@ module QA
end end
end end
   
# Failure issue (in master): https://gitlab.com/gitlab-org/gitlab/issues/37304 it 'creates a merge request with a milestone and label' do
it 'creates a merge request with a milestone and label', :quarantine do
gitlab_account_username = "@#{Runtime::User.username}" gitlab_account_username = "@#{Runtime::User.username}"
   
milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone| milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment