1 files changed, 22 insertions, 5 deletions

diff --git a/spec/models/uploads/fog_spec.rb b/spec/models/uploads/fog_spec.rb
index 899e6f2064c..1ffe7c6c43b 100644
--- a/spec/models/uploads/fog_spec.rb
+++ b/spec/models/uploads/fog_spec.rb
@@ -40,7 +40,9 @@ RSpec.describe Uploads::Fog do
     end
 
     describe '#delete_keys' do
+      let(:connection) { ::Fog::Storage.new(FileUploader.object_store_credentials) }
       let(:keys) { data_store.keys(relation) }
+      let(:paths) { relation.pluck(:path) }
       let!(:uploads) { create_list(:upload, 2, :with_file, :issuable_upload, model: project) }
 
       subject { data_store.delete_keys(keys) }
@@ -50,17 +52,32 @@ RSpec.describe Uploads::Fog do
       end
 
       it 'deletes multiple data' do
-        paths = relation.pluck(:path)
+        paths.each do |path|
+          expect(connection.get_object('uploads', path)[:body]).not_to be_nil
+        end
+
+        subject
+
+        paths.each do |path|
+          expect { connection.get_object('uploads', path)[:body] }.to raise_error(Excon::Error::NotFound)
+        end
+      end
 
-        ::Fog::Storage.new(FileUploader.object_store_credentials).tap do |connection|
+      context 'when one of keys is missing' do
+        let(:keys) { ['unknown'] + super() }
+
+        it 'deletes only existing keys' do
           paths.each do |path|
             expect(connection.get_object('uploads', path)[:body]).not_to be_nil
           end
-        end
 
-        subject
+          expect_next_instance_of(::Fog::Storage) do |storage|
+            allow(storage).to receive(:delete_object).and_call_original
+            expect(storage).to receive(:delete_object).with('uploads', keys.first).and_raise(::Google::Apis::ClientError, 'NotFound')
+          end
+
+          subject
 
-        ::Fog::Storage.new(FileUploader.object_store_credentials).tap do |connection|
           paths.each do |path|
             expect { connection.get_object('uploads', path)[:body] }.to raise_error(Excon::Error::NotFound)
           end