diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/serializers/diff_file_entity_spec.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/serializers/diff_file_entity_spec.rb')
| -rw-r--r-- | spec/serializers/diff_file_entity_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/serializers/diff_file_entity_spec.rb b/spec/serializers/diff_file_entity_spec.rb index c15c9324f94..ebfb21c4311 100644 --- a/spec/serializers/diff_file_entity_spec.rb +++ b/spec/serializers/diff_file_entity_spec.rb @@ -82,7 +82,7 @@ RSpec.describe DiffFileEntity do describe '#is_fully_expanded' do context 'file with a conflict' do - let(:options) { { conflicts: { diff_file.new_path => double(diff_lines_for_serializer: []) } } } + let(:options) { { conflicts: { diff_file.new_path => double(diff_lines_for_serializer: [], conflict_type: :both_modified) } } } it 'returns false' do expect(diff_file).not_to receive(:fully_expanded?) @@ -90,4 +90,6 @@ RSpec.describe DiffFileEntity do end end end + + it_behaves_like 'diff file with conflict_type' end |