diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-05-02 17:48:30 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-05-02 17:48:30 +0000 |
| commit | 703856c75ee7eefbfb536db306eaeec4c4b35e02 (patch) | |
| tree | 1da39f24a91d9e3015efe5cef52b9c7671712a92 /spec | |
| parent | cfbff017d0ba1ba4fd896b4762b23853f123c60a (diff) | |
| parent | 4dda17a5bfe93e06f416fd4e33d487daee41731e (diff) | |
| download | gitlab-ce-703856c75ee7eefbfb536db306eaeec4c4b35e02.tar.gz | |
Merge branch 'make-reply-to-work-everywhere' into 'master'
Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise
Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run.
The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this.
Closes #1556
See merge request !596
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/mailers/notify_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index d28b4768545..dbcf7286e45 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -11,9 +11,8 @@ describe Notify do let(:recipient) { create(:user, email: 'recipient@example.com') } let(:project) { create(:project) } - around(:each) { ActionMailer::Base.deliveries.clear } - before(:each) do + ActionMailer::Base.deliveries.clear email = recipient.emails.create(email: "notifications@example.com") recipient.update_attribute(:notification_email, email.email) end |