Fixes for working with 1.9.1-head

rails · Dec 17, 2009 · 418639b · 418639b
1 parent 186cd7b
commit 418639b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
@@ -54,5 +54,5 @@ module Net
 end
 
 
-gem 'mail', '>= 1.3.0'
+gem 'mail', '>= 1.3.2'
 require 'mail'
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -258,7 +258,6 @@ class Base
     include AbstractController::Layouts
 
     include AbstractController::Helpers
-    helper ActionMailer::MailHelper
 
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter

diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
@@ -534,7 +534,7 @@ def test_from_without_name_for_smtp
     assert_not_nil mail
     mail, from, to = mail
 
-    assert_equal 'system@loudthinking.com', from.to_s
+    assert_equal 'system@loudthinking.com', from.decoded
   end
 
   def test_from_with_name_for_smtp
@@ -545,7 +545,7 @@ def test_from_with_name_for_smtp
     assert_not_nil mail
     mail, from, to = mail
 
-    assert_equal 'system@loudthinking.com', from.to_s
+    assert_equal 'system@loudthinking.com', from.addresses.first
   end
 
   def test_reply_to

diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
@@ -69,10 +69,16 @@ def test_signed_up_with_url
     created = nil
     assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
     assert_not_nil created
+
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised { TestMailer.deliver_signed_up_with_url(@recipient) }
     assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+
+    delivered.message_id = '<123@456>'
+    assert_equal expected.encoded, delivered.encoded
   end
 end