1 files changed, 19 insertions, 2 deletions
diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb
index 8bf7f3f552d..d26c08fb221 100644
--- a/spec/workers/email_receiver_worker_spec.rb
+++ b/spec/workers/email_receiver_worker_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe EmailReceiverWorker, :mailer do
     it "calls the email receiver" do
       expect(Gitlab::Email::Receiver).to receive(:new).with(raw_message).and_call_original
       expect_any_instance_of(Gitlab::Email::Receiver).to receive(:execute)
+      expect(Sidekiq.logger).to receive(:info).with(hash_including(message: "Successfully processed message")).and_call_original
 
       described_class.new.perform(raw_message)
     end
@@ -20,10 +21,11 @@ RSpec.describe EmailReceiverWorker, :mailer do
     context "when an error occurs" do
       before do
         allow_any_instance_of(Gitlab::Email::Receiver).to receive(:execute).and_raise(error)
+        expect(Sidekiq.logger).to receive(:error).with(hash_including('exception.class' => error.class.name)).and_call_original
       end
 
       context 'when the error is Gitlab::Email::EmptyEmailError' do
-        let(:error) { Gitlab::Email::EmptyEmailError }
+        let(:error) { Gitlab::Email::EmptyEmailError.new }
 
         it 'sends out a rejection email' do
           perform_enqueued_jobs do
@@ -38,7 +40,7 @@ RSpec.describe EmailReceiverWorker, :mailer do
       end
 
       context 'when the error is Gitlab::Email::AutoGeneratedEmailError' do
-        let(:error) { Gitlab::Email::AutoGeneratedEmailError }
+        let(:error) { Gitlab::Email::AutoGeneratedEmailError.new }
 
         it 'does not send out any rejection email' do
           perform_enqueued_jobs do
@@ -63,6 +65,21 @@ RSpec.describe EmailReceiverWorker, :mailer do
           expect(email.body.parts.last.to_s).to include("Could not deal with that")
         end
       end
+
+      context 'when the error is ActiveRecord::StatementTimeout' do
+        let(:error) { ActiveRecord::StatementTimeout.new("Statement timeout") }
+
+        it 'does not report the error to the sender' do
+          expect(Gitlab::ErrorTracking).to receive(:track_exception).with(error).and_call_original
+
+          perform_enqueued_jobs do
+            described_class.new.perform(raw_message)
+          end
+
+          email = ActionMailer::Base.deliveries.last
+          expect(email).to be_nil
+        end
+      end
     end
   end