diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-06-08 15:55:20 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-06-08 15:55:20 +0200 |
| commit | 71f99be858b856f95c50103002e45bb55c634b36 (patch) | |
| tree | 6cd114ccf644c66f7d2345ae0a89931079d7d56a | |
| parent | 376eefaa4725c8cd01ca9fee6536676cd24f6381 (diff) | |
| parent | 64edb6cb19863ab78ecea88cf15ed5fd19046ab6 (diff) | |
| download | rails-71f99be858b856f95c50103002e45bb55c634b36.tar.gz rails-71f99be858b856f95c50103002e45bb55c634b36.tar.bz2 rails-71f99be858b856f95c50103002e45bb55c634b36.zip | |
Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_test
Restore test deliveries for ActionMailer.
| -rw-r--r-- | actionpack/test/controller/assert_select_test.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb index 580604df3a..f07d201563 100644 --- a/actionpack/test/controller/assert_select_test.rb +++ b/actionpack/test/controller/assert_select_test.rb @@ -56,13 +56,16 @@ class AssertSelectTest < ActionController::TestCase def setup super + @old_delivery_method = ActionMailer::Base.delivery_method + @old_perform_deliveries = ActionMailer::Base.perform_deliveries ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true - ActionMailer::Base.deliveries = [] end def teardown super + ActionMailer::Base.delivery_method = @old_delivery_method + ActionMailer::Base.perform_deliveries = @old_perform_deliveries ActionMailer::Base.deliveries.clear end |