diff options
Diffstat (limited to 'actionmailer/test/delivery_methods_test.rb')
-rw-r--r-- | actionmailer/test/delivery_methods_test.rb | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb index 7109f23e4c..61a037ea18 100644 --- a/actionmailer/test/delivery_methods_test.rb +++ b/actionmailer/test/delivery_methods_test.rb @@ -22,24 +22,24 @@ end class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase test "default smtp settings" do - settings = { :address => "localhost", - :port => 25, - :domain => 'localhost.localdomain', - :user_name => nil, - :password => nil, - :authentication => nil, - :enable_starttls_auto => true } + settings = { address: "localhost", + port: 25, + domain: 'localhost.localdomain', + user_name: nil, + password: nil, + authentication: nil, + enable_starttls_auto: true } assert_equal settings, ActionMailer::Base.smtp_settings end test "default file delivery settings" do - settings = {:location => "#{Dir.tmpdir}/mails"} + settings = {location: "#{Dir.tmpdir}/mails"} assert_equal settings, ActionMailer::Base.file_settings end test "default sendmail settings" do - settings = {:location => '/usr/sbin/sendmail', - :arguments => '-i -t'} + settings = {location: '/usr/sbin/sendmail', + arguments: '-i -t'} assert_equal settings, ActionMailer::Base.sendmail_settings end end @@ -63,8 +63,8 @@ class CustomDeliveryMethodsTest < ActiveSupport::TestCase end test "allow to customize custom settings" do - ActionMailer::Base.custom_settings = { :foo => :bar } - assert_equal Hash[:foo => :bar], ActionMailer::Base.custom_settings + ActionMailer::Base.custom_settings = { foo: :bar } + assert_equal Hash[foo: :bar], ActionMailer::Base.custom_settings end test "respond to custom settings" do @@ -82,8 +82,8 @@ end class MailDeliveryTest < ActiveSupport::TestCase class DeliveryMailer < ActionMailer::Base DEFAULT_HEADERS = { - :to => 'mikel@test.lindsaar.net', - :from => 'jose@test.plataformatec.com' + to: 'mikel@test.lindsaar.net', + from: 'jose@test.plataformatec.com' } def welcome(hash={}) @@ -110,7 +110,7 @@ class MailDeliveryTest < ActiveSupport::TestCase test "delivery method can be customized per instance" do email = DeliveryMailer.welcome.deliver assert_instance_of Mail::SMTP, email.delivery_method - email = DeliveryMailer.welcome(:delivery_method => :test).deliver + email = DeliveryMailer.welcome(delivery_method: :test).deliver assert_instance_of Mail::TestMailer, email.delivery_method end @@ -125,7 +125,7 @@ class MailDeliveryTest < ActiveSupport::TestCase test "delivery method options default to class level options" do default_options = {a: "b"} ActionMailer::Base.add_delivery_method :optioned, MyOptionedDelivery, default_options - mail_instance = DeliveryMailer.welcome(:delivery_method => :optioned) + mail_instance = DeliveryMailer.welcome(delivery_method: :optioned) assert_equal default_options, mail_instance.delivery_method.options end @@ -133,21 +133,21 @@ class MailDeliveryTest < ActiveSupport::TestCase default_options = {a: "b"} ActionMailer::Base.add_delivery_method :optioned, MyOptionedDelivery, default_options overridden_options = {a: "a"} - mail_instance = DeliveryMailer.welcome(:delivery_method => :optioned, :delivery_method_options => overridden_options) + mail_instance = DeliveryMailer.welcome(delivery_method: :optioned, delivery_method_options: overridden_options) assert_equal overridden_options, mail_instance.delivery_method.options end test "default delivery options can be overridden per mail instance" do - settings = { :address => "localhost", - :port => 25, - :domain => 'localhost.localdomain', - :user_name => nil, - :password => nil, - :authentication => nil, - :enable_starttls_auto => true } + settings = { address: "localhost", + port: 25, + domain: 'localhost.localdomain', + user_name: nil, + password: nil, + authentication: nil, + enable_starttls_auto: true } assert_equal settings, ActionMailer::Base.smtp_settings - overridden_options = {user_name: "overridden", :password => "somethingobtuse"} - mail_instance = DeliveryMailer.welcome(:delivery_method_options => overridden_options) + overridden_options = {user_name: "overridden", password: "somethingobtuse"} + mail_instance = DeliveryMailer.welcome(delivery_method_options: overridden_options) delivery_method_instance = mail_instance.delivery_method assert_equal "overridden", delivery_method_instance.settings[:user_name] assert_equal "somethingobtuse", delivery_method_instance.settings[:password] |