Commit d3da41b3 authored by Walmyr Lima e Silva Filho's avatar Walmyr Lima e Silva Filho

Merge branch 'simplify-it-block-of-a-test' into 'master'

Simplify it block of a test

See merge request gitlab-org/gitlab!20067
parents 6daa1f3c 0b8515d2
...@@ -66,24 +66,22 @@ module QA ...@@ -66,24 +66,22 @@ module QA
expect(page).to have_content(commit_message_of_second_branch) expect(page).to have_content(commit_message_of_second_branch)
expect(page).to have_content(commit_message_of_third_branch) expect(page).to have_content(commit_message_of_third_branch)
Page::Project::Branches::Show.perform do |branches| Page::Project::Branches::Show.perform do |branches_page|
expect(branches).to have_branch_with_badge(second_branch, 'merged') expect(branches_page).to have_branch_with_badge(second_branch, 'merged')
end
Page::Project::Branches::Show.perform do |branches_view| branches_page.delete_branch(third_branch)
branches_view.delete_branch(third_branch)
expect(branches_view).to have_no_branch(third_branch)
end
Page::Project::Branches::Show.perform(&:delete_merged_branches) expect(branches_page).to have_no_branch(third_branch)
expect(page).to have_content( branches_page.delete_merged_branches
expect(branches_page).to have_content(
'Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.' 'Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.'
) )
page.refresh branches_page.refresh
Page::Project::Branches::Show.perform do |branches_view|
expect(branches_view).to have_no_branch(second_branch, reload: true) expect(branches_page).to have_no_branch(second_branch, reload: true)
end end
end 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