Add ability to configure Reply-To address in gitlab.yml

Closes #1305

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index ba42f9e5c70..7c4235ab379 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -7,9 +7,12 @@ describe Notify do
 
   let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
   let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
+  let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
   let(:recipient) { create(:user, email: 'recipient@example.com') }
   let(:project) { create(:project) }
 
+  around(:each) { ActionMailer::Base.deliveries.clear }
+
   before(:each) do
     email = recipient.emails.create(email: "notifications@example.com")
     recipient.update_attribute(:notification_email, email.email)
@@ -27,6 +30,11 @@ describe Notify do
       expect(sender.display_name).to eq(gitlab_sender_display_name)
       expect(sender.address).to eq(gitlab_sender)
     end
+
+    it 'has a Reply-To address' do
+      reply_to = subject.header[:reply_to].addresses
+      expect(reply_to).to eq([gitlab_sender_reply_to])
+    end
   end
 
   shared_examples 'an email starting a new thread' do |message_id_prefix|