From 901ae149ff2653fda8e4ec286aa9cb6b5051b9c6 Mon Sep 17 00:00:00 2001 From: Steve Richert Date: Fri, 24 Apr 2009 10:04:54 -0400 Subject: [PATCH] Changed smtp_settings and sendmail_settings from class variables to class_inheritable_hash variables. --- actionmailer/lib/action_mailer/base.rb | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 69e7787..21f0390 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -258,7 +258,8 @@ module ActionMailer #:nodoc: cattr_accessor :logger - @@smtp_settings = { + class_inheritable_hash :smtp_settings + self.smtp_settings = { :address => "localhost", :port => 25, :domain => 'localhost.localdomain', @@ -267,13 +268,12 @@ module ActionMailer #:nodoc: :authentication => nil, :enable_starttls_auto => true, } - cattr_accessor :smtp_settings - @@sendmail_settings = { + class_inheritable_hash :sendmail_settings + self.sendmail_settings = { :location => '/usr/sbin/sendmail', :arguments => '-i -t' } - cattr_accessor :sendmail_settings @@raise_delivery_errors = true cattr_accessor :raise_delivery_errors -- 1.5.6.4 From 257a58673d261a2b58fdf81f47b1b672693481ac Mon Sep 17 00:00:00 2001 From: Steve Richert Date: Fri, 24 Apr 2009 10:06:02 -0400 Subject: [PATCH] Updated starttls tests to reflect assigning smtp_settings on a per-subclass basis. --- actionmailer/test/mail_service_test.rb | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index b27bda4..90cd51d 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -966,7 +966,7 @@ EOF end def test_starttls_is_enabled_if_supported - ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true + TestMailer.smtp_settings[:enable_starttls_auto] = true MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(true) MockSMTP.any_instance.expects(:enable_starttls_auto) ActionMailer::Base.delivery_method = :smtp @@ -974,7 +974,7 @@ EOF end def test_starttls_is_disabled_if_not_supported - ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true + TestMailer.smtp_settings[:enable_starttls_auto] = true MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(false) MockSMTP.any_instance.expects(:enable_starttls_auto).never ActionMailer::Base.delivery_method = :smtp @@ -982,13 +982,13 @@ EOF end def test_starttls_is_not_enabled - ActionMailer::Base.smtp_settings[:enable_starttls_auto] = false + TestMailer.smtp_settings[:enable_starttls_auto] = false MockSMTP.any_instance.expects(:respond_to?).never MockSMTP.any_instance.expects(:enable_starttls_auto).never ActionMailer::Base.delivery_method = :smtp TestMailer.deliver_signed_up(@recipient) ensure - ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true + TestMailer.smtp_settings[:enable_starttls_auto] = true end end -- 1.5.6.4