diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 18:09:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 18:09:57 +0300 |
commit | 1d9f78b3a4ecd36806890e80e513242d0fdf7b6e (patch) | |
tree | 80ea387bd0d33a19d2213be6aa30c39d67ffb9e5 /spec/serializers/diff_file_metadata_entity_spec.rb | |
parent | b1e352740bd52771b419829abef0a0ad73141ac1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers/diff_file_metadata_entity_spec.rb')
-rw-r--r-- | spec/serializers/diff_file_metadata_entity_spec.rb | 10 |
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 |