diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:38:53 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:46:39 +0530 |
| commit | ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (patch) | |
| tree | d5450558358174f6963323061e25366246ff5801 /actionmailer | |
| parent | dba4c6fe539c24ec1beb106e34f37f3cd0632022 (diff) | |
| download | rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.tar.gz rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.tar.bz2 rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.zip | |
Revert "Merge branch 'master' of github.com:rails/docrails"
This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing
changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9.
Seems to be a code merge done by mistake.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_methods.rb | 2 | ||||
| -rw-r--r-- | actionmailer/test/delivery_methods_test.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb index aedcd81e52..9a1a27c8ed 100644 --- a/actionmailer/lib/action_mailer/delivery_methods.rb +++ b/actionmailer/lib/action_mailer/delivery_methods.rb @@ -64,7 +64,7 @@ module ActionMailer raise "Delivery method cannot be nil" when Symbol if klass = delivery_methods[method] - mail.delivery_method(klass, (send(:"#{method}_settings") || {}).merge(options || {})) + mail.delivery_method(klass,(send(:"#{method}_settings") || {}).merge!(options || {})) else raise "Invalid delivery method #{method.inspect}" end diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb index 20412c7bb2..61a037ea18 100644 --- a/actionmailer/test/delivery_methods_test.rb +++ b/actionmailer/test/delivery_methods_test.rb @@ -152,9 +152,6 @@ 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 |