Merge branch 'thorandy/gitlab-ee-servicedesk-prefer-from-replyto-over-sender' into 'master'

Prefer From over Sender in Service Desk

Closes #3189

See merge request gitlab-org/gitlab-ee!7006

ee/changelogs/unreleased/thorandy-gitlab-ee-servicedesk-prefer-from-replyto-over-sender.yml

+---
+title: Prefer From address over Sender for Service Desk emails
+merge_request: 7006
+author: Andreas Josephson
+type: changed

ee/lib/gitlab/email/handler/ee/service_desk_handler.rb

@@ -59,7 +59,7 @@ module Gitlab
           end
 
           def from_address
-            (mail.reply_to || []).first || mail.sender || mail.from.first
+            (mail.reply_to || []).first || mail.from.first || mail.sender
           end
 
           def issue_title

ee/spec/fixtures/emails/service_desk_sender_and_from.eml

+Delivered-To: incoming+email/test@appmail.adventuretime.ooo
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <incoming+gitlabhq/gitlabhq@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <incoming+gitlabhq/gitlabhq@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Finn the Human <finn@adventuretime.ooo>
+Sender: Jake the Dog <jake@adventuretime.ooo>
+To: support@adventuretime.ooo
+Delivered-To: support@adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: The message subject! @all
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+Service desk stuff!
+
+```
+a = b
+```

ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb

@@ -50,6 +50,26 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
       end
     end
 
+    context 'when there is a sender address and a from address' do
+      let(:email_raw) { fixture_file('emails/service_desk_sender_and_from.eml', dir: 'ee') }
+
+      it 'prefers the from address' do
+        setup_attachment
+
+        expect(Notify).to receive(:service_desk_thank_you_email).with(kind_of(Integer))
+
+        expect { receiver.execute }.to change { Issue.count }.by(1)
+
+        new_issue = Issue.last
+
+        expect(new_issue.author).to eql(User.support_bot)
+        expect(new_issue.confidential?).to be true
+        expect(new_issue.all_references.all).to be_empty
+        expect(new_issue.title).to eq("Service Desk (from finn@adventuretime.ooo): The message subject! @all")
+        expect(new_issue.description).to eq("Service desk stuff!\n\n```\na = b\n```\n\n![image](uploads/image.png)")
+      end
+    end
+
     context 'when license does not support service desk' do
       before do
         allow(::EE::Gitlab::ServiceDesk).to receive(:enabled?).and_return(false)