1 files changed, 7 insertions, 3 deletions
diff --git a/spec/serializers/diff_file_metadata_entity_spec.rb b/spec/serializers/diff_file_metadata_entity_spec.rb
index 3ce1ea49677..6f76d812177 100644
--- a/spec/serializers/diff_file_metadata_entity_spec.rb
+++ b/spec/serializers/diff_file_metadata_entity_spec.rb
@@ -4,8 +4,9 @@ require 'spec_helper'
 
 RSpec.describe DiffFileMetadataEntity do
   let(:merge_request) { create(:merge_request_with_diffs) }
-  let(:raw_diff_file) { merge_request.merge_request_diff.diffs.raw_diff_files.first }
-  let(:entity) { described_class.new(raw_diff_file) }
+  let(:diff_file) { merge_request.merge_request_diff.diffs.raw_diff_files.first }
+  let(:options) { {} }
+  let(:entity) { described_class.new(diff_file, options) }
 
   context 'as json' do
     subject { entity.as_json }
@@ -20,8 +21,11 @@ RSpec.describe DiffFileMetadataEntity do
         :deleted_file,
         :submodule,
         :file_identifier_hash,
-        :file_hash
+        :file_hash,
+        :conflict_type
       )
     end
+
+    it_behaves_like 'diff file with conflict_type'
   end
 end