diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:49:16 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:49:16 +0530 |
| commit | 9abe72c7600132aa964ca48c312ef981007ab8b1 (patch) | |
| tree | 6062ada5e442186cf949df4b9a1502e84bbb0271 /actionmailer/test | |
| parent | d73232c9c8933b9f3092d5d27b7ffab6ccc0422c (diff) | |
| parent | ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (diff) | |
| download | rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.gz rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.bz2 rails-9abe72c7600132aa964ca48c312ef981007ab8b1.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
actionview/README.rdoc
activerecord/lib/active_record/migration.rb
guides/source/development_dependencies_install.md
guides/source/getting_started.md
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/delivery_methods_test.rb | 3 |
1 files changed, 0 insertions, 3 deletions
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 |