diff options
Diffstat (limited to 'spec/serializers/paginated_diff_entity_spec.rb')
-rw-r--r-- | spec/serializers/paginated_diff_entity_spec.rb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb index f408deb734e..db8bf92cbf5 100644 --- a/spec/serializers/paginated_diff_entity_spec.rb +++ b/spec/serializers/paginated_diff_entity_spec.rb @@ -7,11 +7,13 @@ RSpec.describe PaginatedDiffEntity do let(:request) { double('request', current_user: user) } let(:merge_request) { create(:merge_request) } let(:diff_batch) { merge_request.merge_request_diff.diffs_in_batch(2, 3, diff_options: nil) } + let(:allow_tree_conflicts) { false } let(:options) do { request: request, merge_request: merge_request, - pagination_data: diff_batch.pagination_data + pagination_data: diff_batch.pagination_data, + allow_tree_conflicts: allow_tree_conflicts } end @@ -34,7 +36,7 @@ RSpec.describe PaginatedDiffEntity do let(:diff_file_without_conflict) { diff_files.first } let(:resolvable_conflicts) { true } - let(:conflict_file) { double(our_path: diff_file_with_conflict.new_path) } + let(:conflict_file) { double(path: diff_file_with_conflict.new_path, conflict_type: :both_modified) } let(:conflicts) { double(conflicts: double(files: [conflict_file]), can_be_resolved_in_ui?: resolvable_conflicts) } let(:merge_ref_head_diff) { true } @@ -70,6 +72,18 @@ RSpec.describe PaginatedDiffEntity do subject end + + context 'when allow_tree_conflicts is set to true' do + let(:allow_tree_conflicts) { true } + + it 'conflicts are still highlighted' do + expect(conflict_file).to receive(:diff_lines_for_serializer) + expect(diff_file_with_conflict).not_to receive(:diff_lines_for_serializer) + expect(diff_file_without_conflict).to receive(:diff_lines_for_serializer).twice # for highlighted_diff_lines and is_fully_expanded + + subject + end + end end end end |