aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/parameterized_test.rb5
1 files changed, 1 insertions, 4 deletions
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