1 files changed, 46 insertions, 10 deletions

diff --git a/spec/lib/gitlab/verify/uploads_spec.rb b/spec/lib/gitlab/verify/uploads_spec.rb
index 85768308edc..38c30fab1ba 100644
--- a/spec/lib/gitlab/verify/uploads_spec.rb
+++ b/spec/lib/gitlab/verify/uploads_spec.rb
@@ -23,37 +23,73 @@ describe Gitlab::Verify::Uploads do
       FileUtils.rm_f(upload.absolute_path)
 
       expect(failures.keys).to contain_exactly(upload)
-      expect(failure).to be_a(Errno::ENOENT)
-      expect(failure.to_s).to include(upload.absolute_path)
+      expect(failure).to include('No such file or directory')
+      expect(failure).to include(upload.absolute_path)
     end
 
     it 'fails uploads with a mismatched checksum' do
       upload.update!(checksum: 'something incorrect')
 
       expect(failures.keys).to contain_exactly(upload)
-      expect(failure.to_s).to include('Checksum mismatch')
+      expect(failure).to include('Checksum mismatch')
     end
 
     it 'fails uploads with a missing precalculated checksum' do
       upload.update!(checksum: '')
 
       expect(failures.keys).to contain_exactly(upload)
-      expect(failure.to_s).to include('Checksum missing')
+      expect(failure).to include('Checksum missing')
     end
 
     context 'with remote files' do
+      let(:file) { double(:file) }
+
       before do
         stub_uploads_object_storage(AvatarUploader)
+        upload.update!(store: ObjectStorage::Store::REMOTE)
       end
 
-      it 'skips uploads in object storage' do
-        local_failure = create(:upload)
-        create(:upload, :object_storage)
+      describe 'returned hash object' do
+        before do
+          expect(CarrierWave::Storage::Fog::File).to receive(:new).and_return(file)
+        end
+
+        it 'passes uploads in object storage that exist' do
+          expect(file).to receive(:exists?).and_return(true)
+
+          expect(failures).to eq({})
+        end
+
+        it 'fails uploads in object storage that do not exist' do
+          expect(file).to receive(:exists?).and_return(false)
+
+          expect(failures.keys).to contain_exactly(upload)
+          expect(failure).to include('Remote object does not exist')
+        end
+      end
+
+      describe 'performance' do
+        before do
+          allow(file).to receive(:exists?)
+          allow(CarrierWave::Storage::Fog::File).to receive(:new).and_return(file)
+        end
+
+        it "avoids N+1 queries" do
+          control_count = ActiveRecord::QueryRecorder.new { perform_task }
+
+          # Create additional uploads in object storage
+          projects = create_list(:project, 3, :with_avatar)
+          uploads = projects.flat_map(&:uploads)
+          uploads.each do |upload|
+            upload.update!(store: ObjectStorage::Store::REMOTE)
+          end
 
-        failures = {}
-        described_class.new(batch_size: 10).run_batches { |_, failed| failures.merge!(failed) }
+          expect { perform_task }.not_to exceed_query_limit(control_count)
+        end
 
-        expect(failures.keys).to contain_exactly(local_failure)
+        def perform_task
+          described_class.new(batch_size: 100).run_batches { }
+        end
       end
     end
   end