Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs

1 files changed, 14 insertions, 2 deletions

diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 3f028b3bd5c..7ae70c3afb4 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1324,6 +1324,7 @@ describe MergeRequest do
       context 'when broken' do
         before do
           allow(subject).to receive(:broken?) { true }
+          allow(project.repository).to receive(:can_be_merged?).and_return(false)
         end
 
         it 'becomes unmergeable' do
@@ -2150,9 +2151,11 @@ describe MergeRequest do
       before do
         allow(NotificationService).to receive(:new).and_return(notification_service)
         allow(TodoService).to receive(:new).and_return(todo_service)
+
+        allow(subject.project.repository).to receive(:can_be_merged?).and_return(false)
       end
 
-      it 'notifies, but does not notify again if rechecking still results in cannot_be_merged' do
+      it 'notifies conflict, but does not notify again if rechecking still results in cannot_be_merged' do
         expect(notification_service).to receive(:merge_request_unmergeable).with(subject).once
         expect(todo_service).to receive(:merge_request_became_unmergeable).with(subject).once
 
@@ -2161,7 +2164,7 @@ describe MergeRequest do
         subject.mark_as_unmergeable
       end
 
-      it 'notifies whenever merge request is newly unmergeable' do
+      it 'notifies conflict, whenever newly unmergeable' do
         expect(notification_service).to receive(:merge_request_unmergeable).with(subject).twice
         expect(todo_service).to receive(:merge_request_became_unmergeable).with(subject).twice
 
@@ -2171,6 +2174,15 @@ describe MergeRequest do
         subject.mark_as_unchecked
         subject.mark_as_unmergeable
       end
+
+      it 'does not notify whenever merge request is newly unmergeable due to other reasons' do
+        allow(subject.project.repository).to receive(:can_be_merged?).and_return(true)
+
+        expect(notification_service).not_to receive(:merge_request_unmergeable)
+        expect(todo_service).not_to receive(:merge_request_became_unmergeable)
+
+        subject.mark_as_unmergeable
+      end
     end
 
     describe 'check_state?' do