diff options
| author | Zuhao Wan <wanzuhao@gmail.com> | 2014-06-07 00:18:50 +0800 |
|---|---|---|
| committer | Zuhao Wan <wanzuhao@gmail.com> | 2014-06-07 00:18:50 +0800 |
| commit | 64edb6cb19863ab78ecea88cf15ed5fd19046ab6 (patch) | |
| tree | 7c960710997fb2e924576eb168c3df2e3bab6403 /actionpack | |
| parent | ecd4151aa829214c7b10f24bc5eca194089b4319 (diff) | |
| download | rails-64edb6cb19863ab78ecea88cf15ed5fd19046ab6.tar.gz rails-64edb6cb19863ab78ecea88cf15ed5fd19046ab6.tar.bz2 rails-64edb6cb19863ab78ecea88cf15ed5fd19046ab6.zip | |
Restore test deliveries for ActionMailer.
Diffstat (limited to 'actionpack')
| -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 |