diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 15:00:43 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 15:01:24 -0700 |
commit | 3faf7485623da55215d6d7f3dcb2eed92c59c699 (patch) | |
tree | 9af8983ba0576dd010f2d50797b76ef9e86cfa8c /actionmailer/test/base_test.rb | |
parent | de9b870f4026ce0eb40bf2a7dacbd137700910ef (diff) | |
download | rails-3faf7485623da55215d6d7f3dcb2eed92c59c699.tar.gz rails-3faf7485623da55215d6d7f3dcb2eed92c59c699.tar.bz2 rails-3faf7485623da55215d6d7f3dcb2eed92c59c699.zip |
Revert "Merge pull request #18446 from cloud8421/actionmailer-unregister-interceptor"
This reverts commit 65a61ab7c370d2894c11ce276725f723a5c9c111, reversing
changes made to 14314ca18302f18c3d8bb7a63e9f71ac4c2290c2.
This PR broke the build
Diffstat (limited to 'actionmailer/test/base_test.rb')
-rw-r--r-- | actionmailer/test/base_test.rb | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 9828d80044..50f2c71737 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -707,47 +707,6 @@ class BaseTest < ActiveSupport::TestCase end end - test "you can unregister an interceptor to the mail object that gets passed the mail object before delivery" do - mail_side_effects do - ActionMailer::Base.register_interceptor(MyInterceptor) - ActionMailer::Base.unregister_interceptor(MyInterceptor) - mail = BaseMailer.welcome - MyInterceptor.expects(:delivering_email).with(mail).never - mail.deliver_now - end - end - - test "you can unregister an interceptor using its stringified name to the mail object that gets passed the mail object before delivery" do - mail_side_effects do - ActionMailer::Base.register_interceptor("BaseTest::MyInterceptor") - ActionMailer::Base.unregister_interceptor("BaseTest::MyInterceptor") - mail = BaseMailer.welcome - MyInterceptor.expects(:delivering_email).with(mail).never - mail.deliver_now - end - end - - test "you can unregister an interceptor using its symbolized underscored name to the mail object that gets passed the mail object before delivery" do - mail_side_effects do - ActionMailer::Base.register_interceptor(:"base_test/my_interceptor") - ActionMailer::Base.unregister_interceptor(:"base_test/my_interceptor") - mail = BaseMailer.welcome - MyInterceptor.expects(:delivering_email).with(mail).never - mail.deliver_now - end - end - - test "you can unregister multiple interceptors to the mail object that both get passed the mail object before delivery" do - mail_side_effects do - ActionMailer::Base.register_interceptors("BaseTest::MyInterceptor", MySecondInterceptor) - ActionMailer::Base.unregister_interceptors("BaseTest::MyInterceptor", MySecondInterceptor) - mail = BaseMailer.welcome - MyInterceptor.expects(:delivering_email).with(mail).never - MySecondInterceptor.expects(:delivering_email).with(mail).never - mail.deliver_now - end - end - test "being able to put proc's into the defaults hash and they get evaluated on mail sending" do mail1 = ProcMailer.welcome['X-Proc-Method'] yesterday = 1.day.ago @@ -985,41 +944,4 @@ class BasePreviewInterceptorsTest < ActiveSupport::TestCase end end end - - test "you can unregister a preview interceptor to the mail object that gets passed the mail object before previewing" do - ActionMailer::Base.register_preview_interceptor(MyInterceptor) - ActionMailer::Base.unregister_preview_interceptor(MyInterceptor) - mail = BaseMailer.welcome - BaseMailerPreview.any_instance.stubs(:welcome).returns(mail) - MyInterceptor.expects(:previewing_email).with(mail).never - BaseMailerPreview.call(:welcome) - end - - test "you can unregister a preview interceptor using its stringified name to the mail object that gets passed the mail object before previewing" do - ActionMailer::Base.register_preview_interceptor("BasePreviewInterceptorsTest::MyInterceptor") - ActionMailer::Base.unregister_preview_interceptor("BasePreviewInterceptorsTest::MyInterceptor") - mail = BaseMailer.welcome - BaseMailerPreview.any_instance.stubs(:welcome).returns(mail) - MyInterceptor.expects(:previewing_email).with(mail).never - BaseMailerPreview.call(:welcome) - end - - test "you can unregister an interceptor using its symbolized underscored name to the mail object that gets passed the mail object before previewing" do - ActionMailer::Base.register_preview_interceptor(:"base_preview_interceptors_test/my_interceptor") - ActionMailer::Base.unregister_preview_interceptor(:"base_preview_interceptors_test/my_interceptor") - mail = BaseMailer.welcome - BaseMailerPreview.any_instance.stubs(:welcome).returns(mail) - MyInterceptor.expects(:previewing_email).with(mail).never - BaseMailerPreview.call(:welcome) - end - - test "you can unregister multiple preview interceptors to the mail object that both get passed the mail object before previewing" do - ActionMailer::Base.register_preview_interceptors("BasePreviewInterceptorsTest::MyInterceptor", MySecondInterceptor) - ActionMailer::Base.unregister_preview_interceptors("BasePreviewInterceptorsTest::MyInterceptor", MySecondInterceptor) - mail = BaseMailer.welcome - BaseMailerPreview.any_instance.stubs(:welcome).returns(mail) - MyInterceptor.expects(:previewing_email).with(mail).never - MySecondInterceptor.expects(:previewing_email).with(mail).never - BaseMailerPreview.call(:welcome) - end end |