Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 4 deletions

diff --git a/spec/serializers/diffs_entity_spec.rb b/spec/serializers/diffs_entity_spec.rb
index a7446f14745..ea58fcb194e 100644
--- a/spec/serializers/diffs_entity_spec.rb
+++ b/spec/serializers/diffs_entity_spec.rb
@@ -9,8 +9,14 @@ RSpec.describe DiffsEntity do
 
   let(:request) { EntityRequest.new(project: project, current_user: user) }
   let(:merge_request_diffs) { merge_request.merge_request_diffs }
+  let(:allow_tree_conflicts) { false }
   let(:options) do
-    { request: request, merge_request: merge_request, merge_request_diffs: merge_request_diffs }
+    {
+      request: request,
+      merge_request: merge_request,
+      merge_request_diffs: merge_request_diffs,
+      allow_tree_conflicts: allow_tree_conflicts
+    }
   end
 
   let(:entity) do
@@ -87,7 +93,7 @@ RSpec.describe DiffsEntity do
       let(:diff_file_without_conflict) { diff_files.to_a[-2] }
 
       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) }
       let(:conflicts) { double(conflicts: double(files: [conflict_file]), can_be_resolved_in_ui?: resolvable_conflicts) }
 
       let(:merge_ref_head_diff) { true }
@@ -123,6 +129,18 @@ RSpec.describe DiffsEntity 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
diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb
index f408deb734e..5667a96770f 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) }
     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