avoid generating invalid SMTP commands in ruby pre 1.9
Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: actionmailer/lib/action_mailer/base.rb
This commit is contained in:
parent
02c3c9dfbc
commit
7e0aa35c20
|
@ -16,7 +16,7 @@ module ActionMailer
|
|||
def perform_delivery(mail)
|
||||
destinations = mail.destinations
|
||||
mail.ready_to_send
|
||||
sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
|
||||
sender = (mail['return-path'] && mail['return-path'].spec) || Array(mail.from).first
|
||||
|
||||
smtp = Net::SMTP.new(settings[:address], settings[:port])
|
||||
smtp.enable_starttls_auto if settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)
|
||||
|
|
|
@ -31,6 +31,18 @@ class TestMailer < ActionMailer::Base
|
|||
render :text => "Goodbye, Mr. #{recipient}"
|
||||
end
|
||||
|
||||
def from_with_name
|
||||
from "System <system@loudthinking.com>"
|
||||
recipients "root@loudthinking.com"
|
||||
body "Nothing to see here."
|
||||
end
|
||||
|
||||
def from_without_name
|
||||
from "system@loudthinking.com"
|
||||
recipients "root@loudthinking.com"
|
||||
body "Nothing to see here."
|
||||
end
|
||||
|
||||
def cc_bcc(recipient)
|
||||
recipients recipient
|
||||
subject "testing bcc/cc"
|
||||
|
@ -487,6 +499,28 @@ class ActionMailerTest < Test::Unit::TestCase
|
|||
assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
|
||||
end
|
||||
|
||||
def test_from_without_name_for_smtp
|
||||
ActionMailer::Base.delivery_method = :smtp
|
||||
TestMailer.deliver_from_without_name
|
||||
|
||||
mail = MockSMTP.deliveries.first
|
||||
assert_not_nil mail
|
||||
mail, from, to = mail
|
||||
|
||||
assert_equal 'system@loudthinking.com', from.to_s
|
||||
end
|
||||
|
||||
def test_from_with_name_for_smtp
|
||||
ActionMailer::Base.delivery_method = :smtp
|
||||
TestMailer.deliver_from_with_name
|
||||
|
||||
mail = MockSMTP.deliveries.first
|
||||
assert_not_nil mail
|
||||
mail, from, to = mail
|
||||
|
||||
assert_equal 'system@loudthinking.com', from.to_s
|
||||
end
|
||||
|
||||
def test_reply_to
|
||||
expected = new_mail
|
||||
|
||||
|
|
Loading…
Reference in New Issue