From a28f8b5baf10425f53766cad71701e4c18a22d88 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sun, 29 Jan 2017 00:47:16 +0900 Subject: restore `delivery_method` after test Currently use two variables to restore `delivery_method`, but the order of restoring the values is incorrect and does not restore is correctly. --- actionmailer/test/parameterized_test.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'actionmailer/test/parameterized_test.rb') diff --git a/actionmailer/test/parameterized_test.rb b/actionmailer/test/parameterized_test.rb index 47cfe6d712..f52945590b 100644 --- a/actionmailer/test/parameterized_test.rb +++ b/actionmailer/test/parameterized_test.rb @@ -9,10 +9,9 @@ class ParameterizedTest < ActiveSupport::TestCase @previous_logger = ActiveJob::Base.logger ActiveJob::Base.logger = Logger.new(nil) - @original_delivery_method = ActionMailer::Base.delivery_method + @previous_delivery_method = ActionMailer::Base.delivery_method ActionMailer::Base.delivery_method = :test - @previous_delivery_method = ActionMailer::Base.delivery_method @previous_deliver_later_queue_name = ActionMailer::Base.deliver_later_queue_name ActionMailer::Base.deliver_later_queue_name = :test_queue ActionMailer::Base.delivery_method = :test @@ -24,8 +23,6 @@ class ParameterizedTest < ActiveSupport::TestCase ActiveJob::Base.logger = @previous_logger ParamsMailer.deliveries.clear - ActionMailer::Base.delivery_method = @original_delivery_method - ActionMailer::Base.delivery_method = @previous_delivery_method ActionMailer::Base.deliver_later_queue_name = @previous_deliver_later_queue_name end -- cgit v1.2.3