diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-10 14:04:27 +0530 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-10 14:11:02 +0530 |
commit | 99d5a91d7a1942f092c87010cbf93279979822a1 (patch) | |
tree | fc312b9973221f08d75cbbe40e76b826e1908c14 | |
parent | cea3cf177c68bb1fa9326d4e88631b7737ae8a98 (diff) | |
download | gitlab-ce-99d5a91d7a1942f092c87010cbf93279979822a1.tar.gz |
Fix failing `EmailOnPush` spec.
-rw-r--r-- | spec/lib/disable_email_interceptor_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/disable_email_interceptor_spec.rb b/spec/lib/disable_email_interceptor_spec.rb index c2a7b20b84d..309a88151cf 100644 --- a/spec/lib/disable_email_interceptor_spec.rb +++ b/spec/lib/disable_email_interceptor_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe DisableEmailInterceptor, lib: true do before do - ActionMailer::Base.register_interceptor(DisableEmailInterceptor) + Mail.register_interceptor(DisableEmailInterceptor) end it 'should not send emails' do @@ -14,7 +14,7 @@ describe DisableEmailInterceptor, lib: true do # Removing interceptor from the list because unregister_interceptor is # implemented in later version of mail gem # See: https://github.com/mikel/mail/pull/705 - Mail.class_variable_set(:@@delivery_interceptors, []) + Mail.unregister_interceptor(DisableEmailInterceptor) end def deliver_mail |