diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-01 20:03:07 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-18 15:07:57 +0100 |
commit | 799cd471099e032a60fbdb1ba6841e617f6c122f (patch) | |
tree | e18e25e7ec82f9fb35bad04890e57c21a69097af /spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb | |
parent | 50a649530a53a04d2044f9e4c5502586a7ed0c59 (diff) | |
download | gitlab-ce-rc/improve-mr-feature-specs.tar.gz |
Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb | 145 |
1 files changed, 145 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb new file mode 100644 index 00000000000..a045791f6b4 --- /dev/null +++ b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb @@ -0,0 +1,145 @@ +require 'rails_helper' + +describe 'Merge request > User merges only if pipeline succeeds', :js do + let(:merge_request) { create(:merge_request_with_diffs) } + let(:project) { merge_request.target_project } + + before do + project.add_master(merge_request.author) + sign_in(merge_request.author) + end + + context 'project does not have CI enabled' do + it 'allows MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge' + end + end + + context 'when project has CI enabled' do + let!(:pipeline) do + create(:ci_empty_pipeline, + project: project, + sha: merge_request.diff_head_sha, + ref: merge_request.source_branch, + status: status, head_pipeline_of: merge_request) + end + + context 'when merge requests can only be merged if the pipeline succeeds' do + before do + project.update_attribute(:only_allow_merge_if_pipeline_succeeds, true) + end + + context 'when CI is running' do + let(:status) { :running } + + it 'does not allow to merge immediately' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge when pipeline succeeds' + expect(page).not_to have_button '.js-merge-moment' + end + end + + context 'when CI failed' do + let(:status) { :failed } + + it 'does not allow MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_css('button[disabled="disabled"]', text: 'Merge') + expect(page).to have_content('Please retry the job or push a new commit to fix the failure') + end + end + + context 'when CI canceled' do + let(:status) { :canceled } + + it 'does not allow MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).not_to have_button 'Merge' + expect(page).to have_content('Please retry the job or push a new commit to fix the failure') + end + end + + context 'when CI succeeded' do + let(:status) { :success } + + it 'allows MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge' + end + end + + context 'when CI skipped' do + let(:status) { :skipped } + + it 'allows MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge' + end + end + end + + context 'when merge requests can be merged when the build failed' do + before do + project.update_attribute(:only_allow_merge_if_pipeline_succeeds, false) + end + + context 'when CI is running' do + let(:status) { :running } + + it 'allows MR to be merged immediately' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge when pipeline succeeds' + + page.find('.js-merge-moment').click + expect(page).to have_content 'Merge immediately' + end + end + + context 'when CI failed' do + let(:status) { :failed } + + it 'allows MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge' + end + end + + context 'when CI succeeded' do + let(:status) { :success } + + it 'allows MR to be merged' do + visit project_merge_request_path(project, merge_request) + + wait_for_requests + + expect(page).to have_button 'Merge' + end + end + end + end +end |