diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-05-13 09:39:13 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-05-13 09:39:13 +0200 |
| commit | b6d627b49a208262ce2f0994bd27921bed6e0fa6 (patch) | |
| tree | 3f82ba6a1c62e380fac97a234464bca90e380e93 /actionmailer/test | |
| parent | ef8ac1f88522d098534361a10c2da50bc81753fd (diff) | |
| parent | 4d9e4ea47ac2e48960bf901d9eeb6731ab39a507 (diff) | |
| download | rails-b6d627b49a208262ce2f0994bd27921bed6e0fa6.tar.gz rails-b6d627b49a208262ce2f0994bd27921bed6e0fa6.tar.bz2 rails-b6d627b49a208262ce2f0994bd27921bed6e0fa6.zip | |
Merge pull request #15086 from zuhao/refactor_actionmailer_mail_layout_test
Do not clear deliveries in setup.
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/mail_layout_test.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb index 7f959282cb..166dd096d4 100644 --- a/actionmailer/test/mail_layout_test.rb +++ b/actionmailer/test/mail_layout_test.rb @@ -44,16 +44,6 @@ class ExplicitLayoutMailer < ActionMailer::Base end class LayoutMailerTest < ActiveSupport::TestCase - def setup - set_delivery_method :test - ActionMailer::Base.perform_deliveries = true - ActionMailer::Base.deliveries.clear - end - - def teardown - restore_delivery_method - end - def test_should_pickup_default_layout mail = AutoLayoutMailer.hello assert_equal "Hello from layout Inside", mail.body.to_s.strip |