diff options
Diffstat (limited to 'spec/features/merge_request/user_merges_immediately_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_merges_immediately_spec.rb | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_immediately_spec.rb b/spec/features/merge_request/user_merges_immediately_spec.rb new file mode 100644 index 00000000000..b16fc9bfc89 --- /dev/null +++ b/spec/features/merge_request/user_merges_immediately_spec.rb @@ -0,0 +1,41 @@ +require 'rails_helper' + +describe 'Merge requests > User merges immediately', :js do + let(:project) { create(:project, :public, :repository) } + let(:user) { project.creator } + let!(:merge_request) do + create(:merge_request_with_diffs, source_project: project, + author: user, + title: 'Bug NS-04', + head_pipeline: pipeline, + source_branch: pipeline.ref) + end + let(:pipeline) do + create(:ci_pipeline, project: project, + ref: 'master', + sha: project.repository.commit('master').id) + end + + context 'when there is active pipeline for merge request' do + before do + create(:ci_build, pipeline: pipeline) + project.add_master(user) + sign_in(user) + visit project_merge_request_path(project, merge_request) + end + + it 'enables merge immediately' do + page.within '.mr-widget-body' do + find('.dropdown-toggle').click + + Sidekiq::Testing.fake! do + click_link 'Merge immediately' + + expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress') + + wait_for_requests + end + end + end + end +end |