2017-08-01 18:03:07 +00:00
|
|
|
require 'rails_helper'
|
2015-11-24 13:59:02 +00:00
|
|
|
|
2017-08-01 18:03:07 +00:00
|
|
|
describe 'Merge request > User merges when pipeline succeeds', :js do
|
2017-07-26 21:52:10 +00:00
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2017-08-01 18:03:07 +00:00
|
|
|
let(:user) { project.creator }
|
2016-10-07 07:49:43 +00:00
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request_with_diffs, source_project: project,
|
|
|
|
author: user,
|
2017-05-23 16:40:17 +00:00
|
|
|
title: 'Bug NS-04',
|
|
|
|
merge_params: { force_remove_source_branch: '1' })
|
2016-10-07 07:49:43 +00:00
|
|
|
end
|
|
|
|
let(:pipeline) do
|
|
|
|
create(:ci_pipeline, project: project,
|
|
|
|
sha: merge_request.diff_head_sha,
|
2017-05-19 20:51:07 +00:00
|
|
|
ref: merge_request.source_branch,
|
|
|
|
head_pipeline_of: merge_request)
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2017-03-22 19:36:14 +00:00
|
|
|
before do
|
2018-07-11 14:36:08 +00:00
|
|
|
project.add_maintainer(user)
|
2017-03-22 19:36:14 +00:00
|
|
|
end
|
2016-10-07 07:49:43 +00:00
|
|
|
|
2016-11-21 10:20:53 +00:00
|
|
|
context 'when there is active pipeline for merge request' do
|
2015-12-07 10:54:07 +00:00
|
|
|
before do
|
2017-08-01 18:03:07 +00:00
|
|
|
create(:ci_build, pipeline: pipeline)
|
|
|
|
sign_in(user)
|
|
|
|
visit project_merge_request_path(project, merge_request)
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2017-04-06 13:55:11 +00:00
|
|
|
describe 'enabling Merge when pipeline succeeds' do
|
|
|
|
shared_examples 'Merge when pipeline succeeds activator' do
|
|
|
|
it 'activates the Merge when pipeline succeeds feature' do
|
|
|
|
click_button "Merge when pipeline succeeds"
|
2017-01-21 15:20:13 +00:00
|
|
|
|
2017-08-07 02:29:37 +00:00
|
|
|
expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds"
|
2019-01-10 04:08:52 +00:00
|
|
|
expect(page).to have_content "The source branch will not be deleted"
|
2017-05-09 04:15:34 +00:00
|
|
|
expect(page).to have_selector ".js-cancel-auto-merge"
|
2017-08-01 18:03:07 +00:00
|
|
|
visit project_merge_request_path(project, merge_request) # Needed to refresh the page
|
2017-01-21 15:20:13 +00:00
|
|
|
expect(page).to have_content /enabled an automatic merge when the pipeline for \h{8} succeeds/i
|
|
|
|
end
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2017-01-21 15:20:13 +00:00
|
|
|
context "when enabled immediately" do
|
2017-04-06 13:55:11 +00:00
|
|
|
it_behaves_like 'Merge when pipeline succeeds activator'
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when enabled after pipeline status changed' do
|
|
|
|
before do
|
|
|
|
pipeline.run!
|
2015-11-24 13:59:02 +00:00
|
|
|
|
2017-01-21 15:20:13 +00:00
|
|
|
# We depend on merge request widget being reloaded
|
|
|
|
# so we have to wait for asynchronous call to reload it
|
|
|
|
# and have_content expectation handles that.
|
|
|
|
#
|
2019-06-14 13:17:18 +00:00
|
|
|
expect(page).to have_content "Pipeline ##{pipeline.id} running"
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
|
|
|
|
2017-04-06 13:55:11 +00:00
|
|
|
it_behaves_like 'Merge when pipeline succeeds activator'
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when enabled after it was previously canceled' do
|
|
|
|
before do
|
2017-04-06 13:55:11 +00:00
|
|
|
click_button "Merge when pipeline succeeds"
|
|
|
|
click_link "Cancel automatic merge"
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
|
|
|
|
2017-04-06 13:55:11 +00:00
|
|
|
it_behaves_like 'Merge when pipeline succeeds activator'
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
2015-12-03 09:27:34 +00:00
|
|
|
|
2017-01-21 15:20:13 +00:00
|
|
|
context 'when it was enabled and then canceled' do
|
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request_with_diffs,
|
2017-02-17 13:56:13 +00:00
|
|
|
:merge_when_pipeline_succeeds,
|
2017-01-21 15:20:13 +00:00
|
|
|
source_project: project,
|
|
|
|
title: 'Bug NS-04',
|
|
|
|
author: user,
|
2019-05-22 11:45:27 +00:00
|
|
|
merge_user: user)
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
2019-05-22 11:45:27 +00:00
|
|
|
merge_request.merge_params['force_remove_source_branch'] = '0'
|
|
|
|
merge_request.save!
|
2017-04-06 13:55:11 +00:00
|
|
|
click_link "Cancel automatic merge"
|
2017-01-21 15:20:13 +00:00
|
|
|
end
|
|
|
|
|
2017-04-06 13:55:11 +00:00
|
|
|
it_behaves_like 'Merge when pipeline succeeds activator'
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
end
|
2017-04-11 05:01:03 +00:00
|
|
|
|
|
|
|
describe 'enabling Merge when pipeline succeeds via dropdown' do
|
|
|
|
it 'activates the Merge when pipeline succeeds feature' do
|
2018-12-14 16:40:14 +00:00
|
|
|
wait_for_requests
|
|
|
|
|
2017-08-07 02:29:37 +00:00
|
|
|
find('.js-merge-moment').click
|
2017-05-09 04:15:34 +00:00
|
|
|
click_link 'Merge when pipeline succeeds'
|
2017-04-11 05:01:03 +00:00
|
|
|
|
2017-08-07 02:29:37 +00:00
|
|
|
expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds"
|
2019-01-10 04:08:52 +00:00
|
|
|
expect(page).to have_content "The source branch will not be deleted"
|
2017-04-11 05:01:03 +00:00
|
|
|
expect(page).to have_link "Cancel automatic merge"
|
|
|
|
end
|
|
|
|
end
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2016-11-21 10:20:53 +00:00
|
|
|
context 'when merge when pipeline succeeds is enabled' do
|
2015-12-03 09:27:34 +00:00
|
|
|
let(:merge_request) do
|
2019-05-22 11:45:27 +00:00
|
|
|
create(:merge_request_with_diffs, :simple, :merge_when_pipeline_succeeds,
|
|
|
|
source_project: project,
|
|
|
|
author: user,
|
|
|
|
merge_user: user,
|
|
|
|
title: 'MepMep')
|
2015-12-03 09:27:34 +00:00
|
|
|
end
|
2016-10-07 08:10:46 +00:00
|
|
|
let!(:build) do
|
2016-10-07 07:49:43 +00:00
|
|
|
create(:ci_build, pipeline: pipeline)
|
|
|
|
end
|
2015-12-07 10:54:07 +00:00
|
|
|
|
2015-11-24 13:59:02 +00:00
|
|
|
before do
|
2017-06-21 23:44:10 +00:00
|
|
|
sign_in user
|
2017-08-01 18:03:07 +00:00
|
|
|
visit project_merge_request_path(project, merge_request)
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2016-10-07 07:49:43 +00:00
|
|
|
it 'allows to cancel the automatic merge' do
|
2017-04-06 13:55:11 +00:00
|
|
|
click_link "Cancel automatic merge"
|
2015-11-24 13:59:02 +00:00
|
|
|
|
2017-04-06 13:55:11 +00:00
|
|
|
expect(page).to have_button "Merge when pipeline succeeds"
|
2015-12-03 09:27:34 +00:00
|
|
|
|
2017-08-01 18:03:07 +00:00
|
|
|
refresh
|
|
|
|
|
2016-10-08 06:50:28 +00:00
|
|
|
expect(page).to have_content "canceled the automatic merge"
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2019-01-10 04:08:52 +00:00
|
|
|
it 'allows to delete source branch' do
|
|
|
|
click_link "Delete source branch"
|
2018-02-16 21:51:38 +00:00
|
|
|
|
2019-01-10 04:08:52 +00:00
|
|
|
expect(page).to have_content "The source branch will be deleted"
|
2018-02-16 21:51:38 +00:00
|
|
|
end
|
|
|
|
|
2016-11-21 10:20:53 +00:00
|
|
|
context 'when pipeline succeeds' do
|
2017-08-01 18:03:07 +00:00
|
|
|
before do
|
|
|
|
build.success
|
|
|
|
refresh
|
|
|
|
end
|
2016-10-07 08:10:46 +00:00
|
|
|
|
|
|
|
it 'merges merge request' do
|
|
|
|
expect(page).to have_content 'The changes were merged'
|
|
|
|
expect(merge_request.reload).to be_merged
|
|
|
|
end
|
|
|
|
end
|
2017-08-01 18:03:07 +00:00
|
|
|
|
|
|
|
context 'view merge request with MWPS enabled but automatically merge fails' do
|
|
|
|
before do
|
|
|
|
merge_request.update(
|
|
|
|
merge_user: merge_request.author,
|
|
|
|
merge_error: 'Something went wrong'
|
|
|
|
)
|
|
|
|
refresh
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows information about the merge error' do
|
|
|
|
# Wait for the `ci_status` and `merge_check` requests
|
|
|
|
wait_for_requests
|
|
|
|
|
2019-06-04 07:34:35 +00:00
|
|
|
page.within('.mr-section-container') do
|
|
|
|
expect(page).to have_content('Merge failed: Something went wrong')
|
2017-08-01 18:03:07 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'view merge request with MWPS enabled but automatically merge fails' do
|
|
|
|
before do
|
|
|
|
merge_request.update(
|
|
|
|
merge_user: merge_request.author,
|
|
|
|
merge_error: 'Something went wrong'
|
|
|
|
)
|
|
|
|
refresh
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows information about the merge error' do
|
|
|
|
# Wait for the `ci_status` and `merge_check` requests
|
|
|
|
wait_for_requests
|
|
|
|
|
2019-06-04 07:34:35 +00:00
|
|
|
page.within('.mr-section-container') do
|
|
|
|
expect(page).to have_content('Merge failed: Something went wrong')
|
2017-08-01 18:03:07 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
|
2016-11-21 10:20:53 +00:00
|
|
|
context 'when pipeline is not active' do
|
2017-08-01 18:03:07 +00:00
|
|
|
it 'does not allow to enable merge when pipeline succeeds' do
|
|
|
|
visit project_merge_request_path(project, merge_request)
|
2016-11-21 10:20:53 +00:00
|
|
|
|
2017-04-06 13:55:11 +00:00
|
|
|
expect(page).not_to have_link 'Merge when pipeline succeeds'
|
2015-11-24 13:59:02 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|