1 files changed, 153 insertions, 7 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
index cdc00017ab3..19b5ad0fa84 100644
--- 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
@@ -13,11 +13,29 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
 
   context 'project does not have CI enabled' do
     it 'allows MR to be merged' do
+      stub_feature_flags(auto_merge_labels_mr_widget: false)
+
       visit project_merge_request_path(project, merge_request)
 
       wait_for_requests
 
-      expect(page).to have_button 'Merge'
+      page.within('.mr-state-widget') do
+        expect(page).to have_button 'Merge'
+      end
+    end
+  end
+
+  context 'project does not have CI enabled and auto_merge_labels_mr_widget on' do
+    it 'allows MR to be merged' do
+      stub_feature_flags(auto_merge_labels_mr_widget: true)
+
+      visit project_merge_request_path(project, merge_request)
+
+      wait_for_requests
+
+      page.within('.mr-state-widget') do
+        expect(page).to have_button 'Merge'
+      end
     end
   end
 
@@ -33,6 +51,8 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
     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)
+
+        stub_feature_flags(auto_merge_labels_mr_widget: false)
       end
 
       context 'when CI is running' do
@@ -56,7 +76,78 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
 
           wait_for_requests
 
-          expect(page).not_to have_button('Merge')
+          expect(page).not_to have_button('Merge', exact: true)
+          expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
+        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', exact: true)
+          expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
+        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', exact: true)
+        end
+      end
+
+      context 'when CI skipped' do
+        let(:status) { :skipped }
+
+        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', exact: true)
+        end
+      end
+    end
+
+    context 'when merge requests can only be merged if the pipeline succeeds with auto_merge_labels_mr_widget on' do
+      before do
+        project.update_attribute(:only_allow_merge_if_pipeline_succeeds, true)
+
+        stub_feature_flags(auto_merge_labels_mr_widget: 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 'Set to auto-merge'
+          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).not_to have_button('Merge', exact: true)
           expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
         end
       end
@@ -69,7 +160,7 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
 
           wait_for_requests
 
-          expect(page).not_to have_button 'Merge'
+          expect(page).not_to have_button('Merge', exact: true)
           expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
         end
       end
@@ -82,7 +173,7 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
 
           wait_for_requests
 
-          expect(page).to have_button 'Merge'
+          expect(page).to have_button('Merge', exact: true)
         end
       end
 
@@ -94,7 +185,7 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
 
           wait_for_requests
 
-          expect(page).not_to have_button 'Merge'
+          expect(page).not_to have_button('Merge', exact: true)
         end
       end
     end
@@ -102,6 +193,8 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
     context 'when merge requests can be merged when the build failed' do
       before do
         project.update_attribute(:only_allow_merge_if_pipeline_succeeds, false)
+
+        stub_feature_flags(auto_merge_labels_mr_widget: false)
       end
 
       context 'when CI is running' do
@@ -126,8 +219,59 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
           visit project_merge_request_path(project, merge_request)
 
           wait_for_requests
+          page.within('.mr-state-widget') do
+            expect(page).to have_button 'Merge'
+          end
+        end
+      end
 
-          expect(page).to have_button 'Merge'
+      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
+
+          page.within('.mr-state-widget') do
+            expect(page).to have_button 'Merge'
+          end
+        end
+      end
+    end
+
+    context 'when merge requests can be merged when the build failed with auto_merge_labels_mr_widget on' do
+      before do
+        project.update_attribute(:only_allow_merge_if_pipeline_succeeds, false)
+
+        stub_feature_flags(auto_merge_labels_mr_widget: true)
+      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 'Set to auto-merge'
+
+          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
+          page.within('.mr-state-widget') do
+            expect(page).to have_button 'Merge'
+          end
         end
       end
 
@@ -139,7 +283,9 @@ RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, fea
 
           wait_for_requests
 
-          expect(page).to have_button 'Merge'
+          page.within('.mr-state-widget') do
+            expect(page).to have_button 'Merge'
+          end
         end
       end
     end