2 files changed, 18 insertions, 6 deletions
diff --git a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
index 9ff395070ea..585dce331ed 100644
--- a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Gitlab::Email::Handler::CreateNoteHandler do
   it_behaves_like :note_handler_shared_examples do
     let(:recipient) { sent_notification.recipient }
 
-    let(:update_commands_only) { fixture_file('emails/update_commands_only_reply.eml')}
+    let(:update_commands_only) { fixture_file('emails/update_commands_only_reply.eml') }
     let(:no_content)           { fixture_file('emails/no_content_reply.eml') }
     let(:commands_in_reply)    { fixture_file('emails/commands_in_reply.eml') }
     let(:with_quick_actions)   { fixture_file('emails/valid_reply_with_quick_actions.eml') }
@@ -54,7 +54,7 @@ RSpec.describe Gitlab::Email::Handler::CreateNoteHandler do
       end
 
       context 'with a secondary verified email address' do
-        let(:verified_email) { 'alan@adventuretime.ooo'}
+        let(:verified_email) { 'alan@adventuretime.ooo' }
         let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub('jake@adventuretime.ooo', verified_email) }
 
         before do
diff --git a/spec/lib/gitlab/email/handler/service_desk_handler_spec.rb b/spec/lib/gitlab/email/handler/service_desk_handler_spec.rb
index d0aba70081b..08a7383700b 100644
--- a/spec/lib/gitlab/email/handler/service_desk_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/service_desk_handler_spec.rb
@@ -493,11 +493,19 @@ RSpec.describe Gitlab::Email::Handler::ServiceDeskHandler do
       end
 
       it 'does not create an issue' do
-        expect { receiver.execute rescue nil }.not_to change { Issue.count }
+        expect do
+          receiver.execute
+        rescue StandardError
+          nil
+        end.not_to change { Issue.count }
       end
 
       it 'does not send thank you email' do
-        expect { receiver.execute rescue nil }.not_to have_enqueued_job.on_queue('mailers')
+        expect do
+          receiver.execute
+        rescue StandardError
+          nil
+        end.not_to have_enqueued_job.on_queue('mailers')
       end
     end
 
@@ -532,7 +540,7 @@ RSpec.describe Gitlab::Email::Handler::ServiceDeskHandler do
   end
 
   context 'service desk is disabled for the project' do
-    let(:group) { create(:group)}
+    let(:group) { create(:group) }
     let(:project) { create(:project, :public, group: group, path: 'test', service_desk_enabled: false) }
 
     it 'bounces the email' do
@@ -540,7 +548,11 @@ RSpec.describe Gitlab::Email::Handler::ServiceDeskHandler do
     end
 
     it "doesn't create an issue" do
-      expect { receiver.execute rescue nil }.not_to change { Issue.count }
+      expect do
+        receiver.execute
+      rescue StandardError
+        nil
+      end.not_to change { Issue.count }
     end
   end
 end