Test Gitlab::Email::Receiver.

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 466e48b22e1..17b8339edcd 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -16,17 +16,11 @@ module Gitlab
         @raw = raw
       end
 
-      def message
-        @message ||= Mail::Message.new(@raw)
-      rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
-        raise EmailUnparsableError, e
-      end
-
       def execute
-        raise SentNotificationNotFoundError unless sent_notification
-
         raise EmptyEmailError if @raw.blank?
 
+        raise SentNotificationNotFoundError unless sent_notification
+
         raise AutoGeneratedEmailError if message.header.to_s =~ /auto-(generated|replied)/
 
         author = sent_notification.recipient
@@ -35,7 +29,7 @@ module Gitlab
 
         project = sent_notification.project
 
-        raise UserNotAuthorizedError unless author.can?(:create_note, project)
+        raise UserNotAuthorizedError unless project && author.can?(:create_note, project)
 
         raise NoteableNotFoundError unless sent_notification.noteable
 
@@ -59,6 +53,12 @@ module Gitlab
 
       private
 
+      def message
+        @message ||= Mail::Message.new(@raw)
+      rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
+        raise EmailUnparsableError, e
+      end
+
       def reply_key
         reply_key = nil
         message.to.each do |address|