Commit fc4c7956 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '48690-follow-up-from-milestone-tests' into 'master'

Resolve "Follow-up from "Milestone tests""

Closes #48690

See merge request gitlab-org/gitlab-ce!20563
parents 2f83794d a825dc22
......@@ -4,6 +4,7 @@ module QA
class Sidebar < Page::Base
view 'app/views/shared/issuable/_sidebar.html.haml' do
element :labels_block, ".issuable-show-labels"
element :milestones_block, '.block.milestone'
end
def has_label?(label)
......@@ -11,6 +12,12 @@ module QA
!!find('span', text: label)
end
end
def has_milestone?(milestone)
page.within('.block.milestone') do
!!find("[href*='/milestones/']", text: milestone)
end
end
end
end
end
......
......@@ -79,12 +79,6 @@ module QA
click_element :squash_checkbox
end
def has_milestone?(milestone_title)
page.within('.issuable-sidebar') do
!!find("[href*='/milestones/']", text: milestone_title, wait: 1)
end
end
end
end
end
......
......@@ -20,11 +20,12 @@ module QA
merge_request.milestone = current_milestone
end
Page::MergeRequest::Show.perform do |merge_request|
expect(page).to have_content('This is a merge request with a milestone')
expect(page).to have_content('Great feature with milestone')
expect(page).to have_content(/Opened [\w\s]+ ago/)
expect(merge_request).to have_milestone(current_milestone.title)
expect(page).to have_content('This is a merge request with a milestone')
expect(page).to have_content('Great feature with milestone')
expect(page).to have_content(/Opened [\w\s]+ ago/)
Page::Issuable::Sidebar.perform do |sidebar|
expect(sidebar).to have_milestone(current_milestone.title)
end
end
end
......
Markdown is supported
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