Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 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