1 files changed, 2 insertions, 5 deletions
diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb
index 3d77beb9abc..29484d170f8 100644
--- a/spec/serializers/paginated_diff_entity_spec.rb
+++ b/spec/serializers/paginated_diff_entity_spec.rb
@@ -7,13 +7,11 @@ RSpec.describe PaginatedDiffEntity do
   let(:request) { double('request', current_user: user) }
   let(:merge_request) { create(:merge_request) }
   let(:diff_batch) { merge_request.merge_request_diff.diffs_in_batch(2, 3, diff_options: nil) }
-  let(:merge_conflicts_in_diff) { false }
   let(:options) do
     {
       request: request,
       merge_request: merge_request,
-      pagination_data: diff_batch.pagination_data,
-      merge_conflicts_in_diff: merge_conflicts_in_diff
+      pagination_data: diff_batch.pagination_data
     }
   end
 
@@ -43,10 +41,9 @@ RSpec.describe PaginatedDiffEntity do
       subject[:diff_files]
     end
 
-    context 'when merge_conflicts_in_diff is true' do
+    context 'when there are conflicts' do
       let(:conflict_file) { double(path: diff_files.first.new_path, conflict_type: :both_modified) }
       let(:conflicts) { double(conflicts: double(files: [conflict_file]), can_be_resolved_in_ui?: false) }
-      let(:merge_conflicts_in_diff) { true }
 
       before do
         allow(merge_request).to receive(:cannot_be_merged?).and_return(true)