diff options
author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-25 21:47:03 +1100 |
---|---|---|
committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-25 21:47:03 +1100 |
commit | ace74974cf3575bbd3bf7ff4d8a83c3100fd22a9 (patch) | |
tree | ee3f53d8257623cd8544eee40528ddea74096a33 /actionmailer/test/old_base | |
parent | 4240369a4399b944a0652807c545ffe99d7fb0cd (diff) | |
download | rails-ace74974cf3575bbd3bf7ff4d8a83c3100fd22a9.tar.gz rails-ace74974cf3575bbd3bf7ff4d8a83c3100fd22a9.tar.bz2 rails-ace74974cf3575bbd3bf7ff4d8a83c3100fd22a9.zip |
Got AM working with Mail yield on delivery_handler and updated tests
Diffstat (limited to 'actionmailer/test/old_base')
-rw-r--r-- | actionmailer/test/old_base/mail_service_test.rb | 8 | ||||
-rw-r--r-- | actionmailer/test/old_base/url_test.rb | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 2e33abf9d6..fb784328bc 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -387,6 +387,8 @@ class ActionMailerTest < Test::Unit::TestCase end def test_signed_up + TestMailer.delivery_method = :test + Time.stubs(:now => Time.now) expected = new_mail @@ -533,6 +535,8 @@ class ActionMailerTest < Test::Unit::TestCase end def test_reply_to + TestMailer.delivery_method = :test + expected = new_mail expected.to = @recipient @@ -567,6 +571,8 @@ class ActionMailerTest < Test::Unit::TestCase end def test_iso_charset + TestMailer.delivery_method = :test + expected = new_mail( "iso-8859-1" ) expected.to = @recipient expected.subject = encode "testing isø charsets", "iso-8859-1" @@ -601,6 +607,7 @@ class ActionMailerTest < Test::Unit::TestCase end def test_unencoded_subject + TestMailer.delivery_method = :test expected = new_mail expected.to = @recipient expected.subject = "testing unencoded subject" @@ -1029,6 +1036,7 @@ EOF end def test_with_mail_object_deliver + TestMailer.delivery_method = :test mail = TestMailer.headers_with_nonalpha_chars(@recipient) assert_nothing_raised { mail.deliver } assert_equal 1, TestMailer.deliveries.length diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb index 10b6a36efd..5affb47997 100644 --- a/actionmailer/test/old_base/url_test.rb +++ b/actionmailer/test/old_base/url_test.rb @@ -54,6 +54,8 @@ class ActionMailerUrlTest < Test::Unit::TestCase end def test_signed_up_with_url + TestMailer.delivery_method = :test + ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' map.welcome 'welcome', :controller=>"foo", :action=>"bar" |