diff options
Diffstat (limited to 'spec/lib/gitlab/git')
-rw-r--r-- | spec/lib/gitlab/git/blob_spec.rb | 24 | ||||
-rw-r--r-- | spec/lib/gitlab/git/diff_stats_collection_spec.rb | 12 |
2 files changed, 17 insertions, 19 deletions
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb index f25383ef416..06f9767d58b 100644 --- a/spec/lib/gitlab/git/blob_spec.rb +++ b/spec/lib/gitlab/git/blob_spec.rb @@ -301,26 +301,12 @@ describe Gitlab::Git::Blob, :seed_helper do stub_const('Gitlab::Git::Blob::BATCH_SIZE', 2) end - context 'blobs_fetch_in_batches is enabled' do - it 'fetches the blobs in batches' do - expect(client).to receive(:get_blobs).with(first_batch, limit).ordered - expect(client).to receive(:get_blobs).with(second_batch, limit).ordered - expect(client).to receive(:get_blobs).with(third_batch, limit).ordered + it 'fetches the blobs in batches' do + expect(client).to receive(:get_blobs).with(first_batch, limit).ordered + expect(client).to receive(:get_blobs).with(second_batch, limit).ordered + expect(client).to receive(:get_blobs).with(third_batch, limit).ordered - subject - end - end - - context 'blobs_fetch_in_batches is disabled' do - before do - stub_feature_flags(blobs_fetch_in_batches: false) - end - - it 'fetches the blobs in a single batch' do - expect(client).to receive(:get_blobs).with(blob_references, limit) - - subject - end + subject end end end diff --git a/spec/lib/gitlab/git/diff_stats_collection_spec.rb b/spec/lib/gitlab/git/diff_stats_collection_spec.rb index b07690ef39c..82d15a49062 100644 --- a/spec/lib/gitlab/git/diff_stats_collection_spec.rb +++ b/spec/lib/gitlab/git/diff_stats_collection_spec.rb @@ -29,4 +29,16 @@ describe Gitlab::Git::DiffStatsCollection do expect(collection.paths).to eq %w[foo bar] end end + + describe '#real_size' do + it 'returns the number of modified files' do + expect(collection.real_size).to eq('2') + end + + it 'returns capped number when it is bigger than max_files' do + allow(::Commit).to receive(:max_diff_options).and_return(max_files: 1) + + expect(collection.real_size).to eq('1+') + end + end end |