kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_test

Browse source 
Restore test deliveries for ActionMailer.
This commit is contained in:
Yves Senn 2014-06-08 15:55:20 +02:00
commit 71f99be858
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/test/controller/assert_select_test.rb
View file

@ -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