1 files changed, 0 insertions, 30 deletions
diff --git a/spec/services/merge_requests/mergeability_check_service_spec.rb b/spec/services/merge_requests/mergeability_check_service_spec.rb
index c24b83e21a6..ee23238314e 100644
--- a/spec/services/merge_requests/mergeability_check_service_spec.rb
+++ b/spec/services/merge_requests/mergeability_check_service_spec.rb
@@ -190,14 +190,6 @@ RSpec.describe MergeRequests::MergeabilityCheckService, :clean_gitlab_redis_shar
                target_branch: 'conflict-start')
       end
 
-      it 'does not change the merge ref HEAD' do
-        expect(merge_request.merge_ref_head).to be_nil
-
-        subject
-
-        expect(merge_request.reload.merge_ref_head).not_to be_nil
-      end
-
       it 'returns ServiceResponse.error and keeps merge status as cannot_be_merged' do
         result = subject
 
@@ -351,27 +343,5 @@ RSpec.describe MergeRequests::MergeabilityCheckService, :clean_gitlab_redis_shar
         end
       end
     end
-
-    context 'merge with conflicts' do
-      it 'calls MergeToRefService with true allow_conflicts param' do
-        expect(MergeRequests::MergeToRefService).to receive(:new)
-          .with(project: project, current_user: merge_request.author, params: { allow_conflicts: true }).and_call_original
-
-        subject
-      end
-
-      context 'when display_merge_conflicts_in_diff is disabled' do
-        before do
-          stub_feature_flags(display_merge_conflicts_in_diff: false)
-        end
-
-        it 'calls MergeToRefService with false allow_conflicts param' do
-          expect(MergeRequests::MergeToRefService).to receive(:new)
-            .with(project: project, current_user: merge_request.author, params: { allow_conflicts: false }).and_call_original
-
-          subject
-        end
-      end
-    end
   end
 end