diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/serializers/diff_file_entity_spec.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/serializers/diff_file_entity_spec.rb')
-rw-r--r-- | spec/serializers/diff_file_entity_spec.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/serializers/diff_file_entity_spec.rb b/spec/serializers/diff_file_entity_spec.rb index bebe2e2dfb5..1b8456e5c49 100644 --- a/spec/serializers/diff_file_entity_spec.rb +++ b/spec/serializers/diff_file_entity_spec.rb @@ -69,4 +69,15 @@ RSpec.describe DiffFileEntity do end end end + + describe '#is_fully_expanded' do + context 'file with a conflict' do + let(:options) { { conflicts: { diff_file.new_path => double(diff_lines_for_serializer: []) } } } + + it 'returns false' do + expect(diff_file).not_to receive(:fully_expanded?) + expect(subject[:is_fully_expanded]).to eq(false) + end + end + end end |