summaryrefslogtreecommitdiff
path: root/spec/mailers
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-01 17:12:54 -0700
committerStan Hu <stanhu@gmail.com>2015-05-01 22:57:10 -0700
commit4dda17a5bfe93e06f416fd4e33d487daee41731e (patch)
tree6101ee352ae4f9181813714ce9af2323d6c317ad /spec/mailers
parent001c9731e6c03a13699f1cb60e7fbe7f860e30ad (diff)
downloadgitlab-ce-4dda17a5bfe93e06f416fd4e33d487daee41731e.tar.gz
Make Reply-To config apply to change e-mail confirmation and other notifications
sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb3
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