From 0c93a48904bcededd6093138ed81f3c13ac5e63f Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 26 Jul 2013 04:00:56 +0900 Subject: Don't mutate the Base settings by merge!ing the given value --- actionmailer/test/delivery_methods_test.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'actionmailer/test') diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb index 61a037ea18..20412c7bb2 100644 --- a/actionmailer/test/delivery_methods_test.rb +++ b/actionmailer/test/delivery_methods_test.rb @@ -152,6 +152,9 @@ class MailDeliveryTest < ActiveSupport::TestCase assert_equal "overridden", delivery_method_instance.settings[:user_name] assert_equal "somethingobtuse", delivery_method_instance.settings[:password] assert_equal delivery_method_instance.settings.merge(overridden_options), delivery_method_instance.settings + + # make sure that overriding delivery method options per mail instance doesn't affect the Base setting + assert_equal settings, ActionMailer::Base.smtp_settings end test "non registered delivery methods raises errors" do -- cgit v1.2.3