Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 31 insertions, 0 deletions

diff --git a/spec/lib/gitlab/diff/file_collection/merge_request_diff_batch_spec.rb b/spec/lib/gitlab/diff/file_collection/merge_request_diff_batch_spec.rb
index 72a66b0451e..670c734ce08 100644
--- a/spec/lib/gitlab/diff/file_collection/merge_request_diff_batch_spec.rb
+++ b/spec/lib/gitlab/diff/file_collection/merge_request_diff_batch_spec.rb
@@ -18,6 +18,10 @@ RSpec.describe Gitlab::Diff::FileCollection::MergeRequestDiffBatch do
 
   let(:diff_files) { subject.diff_files }
 
+  before do
+    stub_feature_flags(diffs_gradual_load: false)
+  end
+
   describe 'initialize' do
     it 'memoizes pagination_data' do
       expect(subject.pagination_data).to eq(current_page: 1, next_page: 2, total_pages: 2)
@@ -97,6 +101,18 @@ RSpec.describe Gitlab::Diff::FileCollection::MergeRequestDiffBatch do
         expect(collection.diff_files.map(&:new_path)).to eq(expected_batch_files)
       end
     end
+
+    context 'with diffs gradual load feature flag enabled' do
+      let(:batch_page) { 0 }
+
+      before do
+        stub_feature_flags(diffs_gradual_load: true)
+      end
+
+      it 'returns correct diff files' do
+        expect(subject.diffs.map(&:new_path)).to eq(diff_files_relation.page(1).per(batch_size).map(&:new_path))
+      end
+    end
   end
 
   it_behaves_like 'unfoldable diff' do
@@ -114,6 +130,7 @@ RSpec.describe Gitlab::Diff::FileCollection::MergeRequestDiffBatch do
     end
 
     let(:diffable) { merge_request.merge_request_diff }
+    let(:batch_page) { 2 }
     let(:stub_path) { '.gitignore' }
 
     subject do
@@ -127,4 +144,18 @@ RSpec.describe Gitlab::Diff::FileCollection::MergeRequestDiffBatch do
   it_behaves_like 'cacheable diff collection' do
     let(:cacheable_files_count) { batch_size }
   end
+
+  it_behaves_like 'unsortable diff files' do
+    let(:diffable) { merge_request.merge_request_diff }
+    let(:collection_default_args) do
+      { diff_options: {} }
+    end
+
+    subject do
+      described_class.new(merge_request.merge_request_diff,
+                          batch_page,
+                          batch_size,
+                          **collection_default_args)
+    end
+  end
 end