1 files changed, 186 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
new file mode 100644
index 00000000000..890774922aa
--- /dev/null
+++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
@@ -0,0 +1,186 @@
+require 'rails_helper'
+
+describe 'Merge request > User merges when pipeline succeeds', :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',
+                                      merge_params: { force_remove_source_branch: '1' })
+  end
+  let(:pipeline) do
+    create(:ci_pipeline, project: project,
+                         sha: merge_request.diff_head_sha,
+                         ref: merge_request.source_branch,
+                         head_pipeline_of: merge_request)
+  end
+
+  before do
+    project.add_master(user)
+  end
+
+  context 'when there is active pipeline for merge request' do
+    before do
+      create(:ci_build, pipeline: pipeline)
+      sign_in(user)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    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"
+
+          expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds"
+          expect(page).to have_content "The source branch will not be removed"
+          expect(page).to have_selector ".js-cancel-auto-merge"
+          visit project_merge_request_path(project, merge_request) # Needed to refresh the page
+          expect(page).to have_content /enabled an automatic merge when the pipeline for \h{8} succeeds/i
+        end
+      end
+
+      context "when enabled immediately" do
+        it_behaves_like 'Merge when pipeline succeeds activator'
+      end
+
+      context 'when enabled after pipeline status changed' do
+        before do
+          pipeline.run!
+
+          # 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.
+          #
+          expect(page).to have_content "Pipeline ##{pipeline.id} running"
+        end
+
+        it_behaves_like 'Merge when pipeline succeeds activator'
+      end
+
+      context 'when enabled after it was previously canceled' do
+        before do
+          click_button "Merge when pipeline succeeds"
+          click_link "Cancel automatic merge"
+        end
+
+        it_behaves_like 'Merge when pipeline succeeds activator'
+      end
+
+      context 'when it was enabled and then canceled' do
+        let(:merge_request) do
+          create(:merge_request_with_diffs,
+                 :merge_when_pipeline_succeeds,
+                   source_project: project,
+                   title: 'Bug NS-04',
+                   author: user,
+                   merge_user: user,
+                   merge_params: { force_remove_source_branch: '1' })
+        end
+
+        before do
+          click_link "Cancel automatic merge"
+        end
+
+        it_behaves_like 'Merge when pipeline succeeds activator'
+      end
+    end
+
+    describe 'enabling Merge when pipeline succeeds via dropdown' do
+      it 'activates the Merge when pipeline succeeds feature' do
+        find('.js-merge-moment').click
+        click_link 'Merge when pipeline succeeds'
+
+        expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds"
+        expect(page).to have_content "The source branch will not be removed"
+        expect(page).to have_link "Cancel automatic merge"
+      end
+    end
+  end
+
+  context 'when merge when pipeline succeeds is enabled' do
+    let(:merge_request) do
+      create(:merge_request_with_diffs, :simple,  source_project: project,
+                                                  author: user,
+                                                  merge_user: user,
+                                                  title: 'MepMep',
+                                                  merge_when_pipeline_succeeds: true)
+    end
+    let!(:build) do
+      create(:ci_build, pipeline: pipeline)
+    end
+
+    before do
+      sign_in user
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'allows to cancel the automatic merge' do
+      click_link "Cancel automatic merge"
+
+      expect(page).to have_button "Merge when pipeline succeeds"
+
+      refresh
+
+      expect(page).to have_content "canceled the automatic merge"
+    end
+
+    context 'when pipeline succeeds' do
+      before do
+        build.success
+        refresh
+      end
+
+      it 'merges merge request' do
+        expect(page).to have_content 'The changes were merged'
+        expect(merge_request.reload).to be_merged
+      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
+
+        page.within('.mr-widget-body') do
+          expect(page).to have_content('Something went wrong')
+        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
+
+        page.within('.mr-widget-body') do
+          expect(page).to have_content('Something went wrong')
+        end
+      end
+    end
+  end
+
+  context 'when pipeline is not active' do
+    it 'does not allow to enable merge when pipeline succeeds' do
+      visit project_merge_request_path(project, merge_request)
+
+      expect(page).not_to have_link 'Merge when pipeline succeeds'
+    end
+  end
+end