Add test that checks actual merge for MWBS feature

This commit is contained in:
Grzegorz Bizon 2016-10-07 10:10:46 +02:00
parent 2f66969e43
commit e351ed2d11
1 changed files with 13 additions and 2 deletions

View File

@ -58,7 +58,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
merge_when_build_succeeds: true)
end
background do
let!(:build) do
create(:ci_build, pipeline: pipeline)
end
@ -72,7 +72,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
expect(page).to have_button "Merge When Build Succeeds"
visit_merge_request(merge_request) # Needed to refresh the page
visit_merge_request(merge_request) # refresh the page
expect(page).to have_content "Canceled the automatic merge"
end
@ -82,6 +82,17 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
click_link "Remove Source Branch When Merged"
expect(page).to have_content "The source branch will be removed"
end
context 'when build succeeds' do
background { build.success }
it 'merges merge request' do
visit_merge_request(merge_request) # refresh the page
expect(page).to have_content 'The changes were merged'
expect(merge_request.reload).to be_merged
end
end
end
context 'when build is not active' do