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/support/shared_examples/serializers | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/support/shared_examples/serializers')
-rw-r--r-- | spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb b/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb index 7608f1c7f8a..32adf98969c 100644 --- a/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb +++ b/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb @@ -63,3 +63,19 @@ end RSpec.shared_examples 'diff file discussion entity' do it_behaves_like 'diff file base entity' end + +RSpec.shared_examples 'diff file with conflict_type' do + describe '#conflict_type' do + it 'returns nil by default' do + expect(subject[:conflict_type]).to be_nil + end + + context 'when there is matching conflict file' do + let(:options) { { conflicts: { diff_file.new_path => double(diff_lines_for_serializer: [], conflict_type: :both_modified) } } } + + it 'returns false' do + expect(subject[:conflict_type]).to eq(:both_modified) + end + end + end +end |