Merge branch 'master' of git://github.com/mikel/rails into mail

Conflicts:
	actionmailer/lib/action_mailer.rb

11 files changed, 178 insertions, 112 deletions

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index e84b3b0d23..af6f1bc92e 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -1,12 +1,9 @@
-root = File.expand_path('../../..', __FILE__)
 begin
-  require "#{root}/vendor/gems/environment"
+  require File.expand_path('../../../vendor/gems/environment', __FILE__)
 rescue LoadError
-  $:.unshift("#{root}/activesupport/lib")
-  $:.unshift("#{root}/actionpack/lib")
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+lib = File.expand_path('../../lib', __FILE__)
 $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 require 'rubygems'
diff --git a/actionmailer/test/adv_attr_test.rb b/actionmailer/test/adv_attr_test.rb
index fd909a5627..f22d733bc5 100644
--- a/actionmailer/test/adv_attr_test.rb
+++ b/actionmailer/test/adv_attr_test.rb
@@ -1,18 +1,36 @@
 require 'abstract_unit'
 require 'action_mailer/adv_attr_accessor'
 
-class AdvAttrTest < Test::Unit::TestCase
+class AdvAttrTest < ActiveSupport::TestCase
   class Person
-    include ActionMailer::AdvAttrAccessor
+    cattr_reader :protected_instance_variables
+    @@protected_instance_variables = []
+
+    extend ActionMailer::AdvAttrAccessor
     adv_attr_accessor :name
   end
 
+  def setup
+    @person = Person.new
+  end
+
   def test_adv_attr
-    bob = Person.new
-    assert_nil bob.name
-    bob.name 'Bob'
-    assert_equal 'Bob', bob.name
+    assert_nil @person.name
+    @person.name 'Bob'
+    assert_equal 'Bob', @person.name
+  end
+
+  def test_adv_attr_writer
+    assert_nil @person.name
+    @person.name = 'Bob'
+    assert_equal 'Bob', @person.name
+  end
+
+  def test_raise_an_error_with_multiple_args
+    assert_raise(ArgumentError) { @person.name('x', 'y') }
+  end
 
-    assert_raise(ArgumentError) {bob.name 'x', 'y'}
+  def test_ivar_is_added_to_protected_instnace_variables
+    assert Person.protected_instance_variables.include?('@name')
   end
 end
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb
index 0b74fe8c24..f3383e5608 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/asset_host_test.rb
@@ -24,7 +24,7 @@ class AssetHostTest < Test::Unit::TestCase
   def test_asset_host_as_string
     ActionController::Base.asset_host = "http://www.example.com"
     mail = AssetHostMailer.deliver_email_with_asset(@recipient)
-    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.decoded.strip
+    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
   def test_asset_host_as_one_arguement_proc
@@ -36,7 +36,7 @@ class AssetHostTest < Test::Unit::TestCase
       end
     }
     mail = AssetHostMailer.deliver_email_with_asset(@recipient)
-    assert_equal "<img alt=\"Somelogo\" src=\"http://images.example.com/images/somelogo.png\" />", mail.body.decoded.strip
+    assert_equal "<img alt=\"Somelogo\" src=\"http://images.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
   def test_asset_host_as_two_arguement_proc
@@ -49,6 +49,6 @@ class AssetHostTest < Test::Unit::TestCase
     }
     mail = nil
     assert_nothing_raised { mail = AssetHostMailer.deliver_email_with_asset(@recipient) }
-    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.decoded.strip
+    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 end
\ No newline at end of file
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index d04215171d..2d3565d159 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -56,7 +56,7 @@ end
 class MailerHelperTest < Test::Unit::TestCase
   def new_mail( charset="utf-8" )
     mail = Mail.new
-    mail.content_type(["text", "plain", { "charset" => charset }])
+    mail.set_content_type "text", "plain", { "charset" => charset } if charset
     mail
   end
 
diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb
index 4775545039..84f13a6d3c 100644
--- a/actionmailer/test/mail_layout_test.rb
+++ b/actionmailer/test/mail_layout_test.rb
@@ -65,7 +65,7 @@ class LayoutMailerTest < Test::Unit::TestCase
 
   def test_should_pickup_default_layout
     mail = AutoLayoutMailer.create_hello(@recipient)
-    assert_equal "Hello from layout Inside", mail.body.decoded.strip
+    assert_equal "Hello from layout Inside", mail.body.to_s.strip
   end
 
   def test_should_pickup_multipart_layout
@@ -81,7 +81,7 @@ class LayoutMailerTest < Test::Unit::TestCase
     
     # CHANGED: body returns an object
     # assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.decoded
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
 
     # CHANGED: content_type returns an object
     # assert_equal 'text/html', mail.parts.last.content_type
@@ -89,7 +89,7 @@ class LayoutMailerTest < Test::Unit::TestCase
 
     # CHANGED: body returns an object
     # assert_equal "Hello from layout text/html multipart", mail.parts.last.body
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.decoded
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
   end
 
   def test_should_pickup_multipartmixed_layout
@@ -104,14 +104,14 @@ class LayoutMailerTest < Test::Unit::TestCase
     assert_equal 'text/plain', mail.parts.first.content_type.string
     # CHANGED: body returns an object
     # assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.decoded
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
 
     # CHANGED: content_type returns an object
     # assert_equal 'text/html', mail.parts.last.content_type
     assert_equal 'text/html', mail.parts.last.content_type.string
     # CHANGED: body returns an object
     # assert_equal "Hello from layout text/html multipart", mail.parts.last.body
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.decoded
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
   end
 
   def test_should_fix_multipart_layout
@@ -120,30 +120,30 @@ class LayoutMailerTest < Test::Unit::TestCase
     assert_equal 2, mail.parts.size
 
     assert_equal 'text/plain', mail.parts.first.content_type.string
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.decoded
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
 
     assert_equal 'text/html', mail.parts.last.content_type.string
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.decoded
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
   end
 
 
   def test_should_pickup_layout_given_to_render
     mail = AutoLayoutMailer.create_spam(@recipient)
-    assert_equal "Spammer layout Hello, Earth", mail.body.decoded.strip
+    assert_equal "Spammer layout Hello, Earth", mail.body.to_s.strip
   end
 
   def test_should_respect_layout_false
     mail = AutoLayoutMailer.create_nolayout(@recipient)
-    assert_equal "Hello, Earth", mail.body.decoded.strip
+    assert_equal "Hello, Earth", mail.body.to_s.strip
   end
 
   def test_explicit_class_layout
     mail = ExplicitLayoutMailer.create_signup(@recipient)
-    assert_equal "Spammer layout We do not spam", mail.body.decoded.strip
+    assert_equal "Spammer layout We do not spam", mail.body.to_s.strip
   end
 
   def test_explicit_layout_exceptions
     mail = ExplicitLayoutMailer.create_logout(@recipient)
-    assert_equal "You logged out", mail.body.decoded.strip
+    assert_equal "You logged out", mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb
index 3c97ad2a03..09ce5e4854 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/mail_render_test.rb
@@ -40,13 +40,22 @@ class RenderMailer < ActionMailer::Base
     from       "tester@example.com"
   end
 
-  def included_old_subtemplate(recipient)
+  def mailer_accessor(recipient)
     recipients recipient
-    subject    "Including another template in the one being rendered"
+    subject    "Mailer Accessor"
     from       "tester@example.com"
 
-    @world = "Earth"
-    render :inline => "Hello, <%= render \"subtemplate\" %>"
+    render :inline => "Look, <%= mailer.subject %>!"
+  end
+
+  def no_instance_variable(recipient)
+    recipients recipient
+    subject    "No Instance Variable"
+    from       "tester@example.com"
+
+    silence_warnings do
+      render :inline => "Look, subject.nil? is <%= @subject.nil? %>!"
+    end
   end
 
   def initialize_defaults(method_name)
@@ -71,6 +80,8 @@ class SecondMailer < ActionMailer::Base
   end
 end
 
+# CHANGED: Those tests were changed because body returns an object now
+# Instead of mail.body.strip, we should mail.body.to_s.strip
 class RenderHelperTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
@@ -86,37 +97,37 @@ class RenderHelperTest < Test::Unit::TestCase
 
   def test_implicit_body
     mail = RenderMailer.create_implicit_body(@recipient)
-    # CHANGED: body returns an object now
-    # assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.decoded.strip
+    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
   end
 
   def test_inline_template
     mail = RenderMailer.create_inline_template(@recipient)
-    # CHANGED: body returns an object now
-    # assert_equal "Hello, Earth", mail.body.strip
-    assert_equal "Hello, Earth", mail.body.decoded.strip
+    assert_equal "Hello, Earth", mail.body.to_s.strip
   end
 
   def test_file_template
     mail = RenderMailer.create_file_template(@recipient)
-    # CHANGED: body returns an object now
-    # assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.decoded.strip
+    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
   end
 
   def test_rxml_template
     mail = RenderMailer.deliver_rxml_template(@recipient)
-    # CHANGED: body returns an object now
-    # assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.strip
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.decoded.strip
+    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.to_s.strip
   end
 
   def test_included_subtemplate
     mail = RenderMailer.deliver_included_subtemplate(@recipient)
-    # CHANGED: body returns an object now
-    # assert_equal "Hey Ho, let's go!", mail.body.strip
-    assert_equal "Hey Ho, let's go!", mail.body.decoded.strip
+    assert_equal "Hey Ho, let's go!", mail.body.to_s.strip
+  end
+
+  def test_mailer_accessor
+    mail = RenderMailer.deliver_mailer_accessor(@recipient)
+    assert_equal "Look, Mailer Accessor!", mail.body.to_s.strip
+  end
+
+  def test_no_instance_variable
+    mail = RenderMailer.deliver_no_instance_variable(@recipient)
+    assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
   end
 end
 
@@ -135,12 +146,12 @@ class FirstSecondHelperTest < Test::Unit::TestCase
 
   def test_ordering
     mail = FirstMailer.create_share(@recipient)
-    assert_equal "first mail", mail.body.decoded.strip
+    assert_equal "first mail", mail.body.to_s.strip
     mail = SecondMailer.create_share(@recipient)
-    assert_equal "second mail", mail.body.decoded.strip
+    assert_equal "second mail", mail.body.to_s.strip
     mail = FirstMailer.create_share(@recipient)
-    assert_equal "first mail", mail.body.decoded.strip
+    assert_equal "first mail", mail.body.to_s.strip
     mail = SecondMailer.create_share(@recipient)
-    assert_equal "second mail", mail.body.decoded.strip
+    assert_equal "second mail", mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 7a47a654cd..152900259d 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -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"
+    render :text => "Nothing to see here."
+  end
+
+  def from_without_name
+    from       "system@loudthinking.com"
+    recipients "root@loudthinking.com"
+    render :text => "Nothing to see here."
+  end
+
   def cc_bcc(recipient)
     recipients recipient
     subject    "testing bcc/cc"
@@ -95,7 +107,7 @@ class TestMailer < ActionMailer::Base
     cc         "Foo áëô îü <extended@example.net>"
     bcc        "Foo áëô îü <extended@example.net>"
     charset    "utf-8"
-
+    
     render :text => "åœö blah"
   end
 
@@ -227,7 +239,7 @@ class TestMailer < ActionMailer::Base
     from         "test@example.com"
     content_type "multipart/mixed"
 
-    part :content_type => "multipart/alternative", :content_disposition => "inline", :headers => { "foo" => "bar" } do |p|
+    part :content_type => "multipart/alternative", :content_disposition => "inline", "foo" => "bar" do |p|
       p.part :content_type => "text/plain", :body => "test text\nline #2"
       p.part :content_type => "text/html", :body => "<b>test</b> HTML<br/>\nline #2"
     end
@@ -252,7 +264,7 @@ class TestMailer < ActionMailer::Base
     from         "test@example.com"
     content_type "multipart/related"
     part         :content_type => "text/html", :body => 'yo'
-    attachment   :content_type => "image/jpeg", :filename => File.join(File.dirname(__FILE__), "fixtures", "attachments", "test.jpg"), :data => "i am not a real picture", :headers => { 'Content-ID' => '<test@test.com>' }
+    attachment   :content_type => "image/jpeg", :filename => File.join(File.dirname(__FILE__), "fixtures", "attachments", "test.jpg"), :data => "i am not a real picture", 'Content-ID' => '<test@test.com>'
   end
 
   def unnamed_attachment(recipient)
@@ -289,6 +301,7 @@ class TestMailer < ActionMailer::Base
     render :text => "testing"
   end
 
+  # This tests body calls accepeting a hash, which is deprecated.
   def body_ivar(recipient)
     recipients   recipient
     subject      "Body as a local variable"
@@ -351,7 +364,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     assert_equal "multipart/mixed", created.content_type.string
     assert_equal "multipart/alternative", created.parts[0].content_type.string
-    assert_equal "bar", created.parts[0].header['foo'].decoded
+    assert_equal "bar", created.parts[0].header['foo'].to_s
     assert_nil created.parts[0].charset
     assert_equal "text/plain", created.parts[0].parts[0].content_type.string
     assert_equal "text/html", created.parts[0].parts[1].content_type.string
@@ -370,9 +383,9 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal "multipart/mixed", created.content_type.string
     assert_equal "multipart/alternative", created.parts.first.content_type.string
     assert_equal "text/plain", created.parts.first.parts.first.content_type.string
-    assert_equal "Nothing to see here.", created.parts.first.parts.first.body.decoded
+    assert_equal "Nothing to see here.", created.parts.first.parts.first.body.to_s
     assert_equal "text/html", created.parts.first.parts.second.content_type.string
-    assert_equal "<b>test</b> HTML<br/>", created.parts.first.parts.second.body.decoded
+    assert_equal "<b>test</b> HTML<br/>", created.parts.first.parts.second.body.to_s
   end
 
   def test_attachment_with_custom_header
@@ -413,11 +426,11 @@ class ActionMailerTest < Test::Unit::TestCase
 
   def test_subject_with_i18n
     assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) }
-    assert_equal "Subject with i18n", ActionMailer::Base.deliveries.first.subject.decoded
+    assert_equal "Subject with i18n", ActionMailer::Base.deliveries.first.subject.to_s
 
     I18n.backend.store_translations('en', :actionmailer => {:test_mailer => {:subject_with_i18n => {:subject => "New Subject!"}}})
     assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) }
-    assert_equal "New Subject!", ActionMailer::Base.deliveries.last.subject.decoded
+    assert_equal "New Subject!", ActionMailer::Base.deliveries.last.subject.to_s
   end
 
   def test_custom_template
@@ -514,6 +527,28 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, delivered.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.addresses.first
+  end
+
   def test_reply_to
     expected = new_mail
 
@@ -696,7 +731,7 @@ Content-Type: text/plain; charset=iso-8859-1
 The body
 EOF
     mail = Mail.new(msg)
-    assert_equal "testing testing \326\244", mail.subject.decoded
+    assert_equal "testing testing \326\244", mail.subject.to_s
     assert_equal "Subject: =?utf-8?Q?testing_testing_=D6=A4?=\r\n", mail.subject.encoded
   end
 
@@ -709,7 +744,7 @@ Content-Type: text/plain; charset=iso-8859-1
 The body
 EOF
     mail = Mail.new(msg)
-    assert_equal "this == working?", mail.subject.decoded
+    assert_equal "this == working?", mail.subject.to_s
     assert_equal "Subject: this == working?\r\n", mail.subject.encoded
   end
 
@@ -723,7 +758,7 @@ Content-Transfer-Encoding: 7bit
 The=3Dbody
 EOF
     mail = Mail.new(msg)
-    assert_equal "The=3Dbody", mail.body.decoded.strip
+    assert_equal "The=3Dbody", mail.body.to_s.strip
     assert_equal "The=3Dbody", mail.body.encoded.strip
   end
 
@@ -737,7 +772,7 @@ Content-Transfer-Encoding: quoted-printable
 The=3Dbody
 EOF
     mail = Mail.new(msg)
-    assert_equal "The=body", mail.body.decoded.strip
+    assert_equal "The=body", mail.body.to_s.strip
     assert_equal "The=3Dbody", mail.body.encoded.strip
   end
 
@@ -751,7 +786,7 @@ Content-Transfer-Encoding: base64
 VGhlIGJvZHk=
 EOF
     mail = Mail.new(msg)
-    assert_equal "The body", mail.body.decoded.strip
+    assert_equal "The body", mail.body.to_s.strip
     assert_equal "VGhlIGJvZHk=", mail.body.encoded.strip
   end
 
@@ -825,7 +860,7 @@ EOF
   def test_receive_decodes_base64_encoded_mail
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email")
     TestMailer.receive(fixture)
-    assert_match(/Jamis/, TestMailer.received_body.decoded)
+    assert_match(/Jamis/, TestMailer.received_body.to_s)
   end
 
   def test_receive_attachments
@@ -895,7 +930,6 @@ EOF
     mail = TestMailer.create_explicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
     assert_equal 'multipart/mixed', mail.content_type.string
-
     assert_equal "text/plain", mail.parts[0].content_type.string
 
     assert_equal "text/html", mail.parts[1].content_type.string
@@ -903,7 +937,6 @@ EOF
 
     assert_equal "image/jpeg", mail.parts[2].content_type.string
     assert_equal "attachment", mail.parts[2].content_disposition.disposition_type
-
     assert_equal "foo.jpg", mail.parts[2].content_disposition.filename
     assert_equal "foo.jpg", mail.parts[2].content_type.filename
     assert_nil mail.parts[2].charset
@@ -926,13 +959,13 @@ EOF
 
     mail = TestMailer.create_implicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
-    assert_equal "1.0", mail.mime_version.decoded
+    assert_equal "1.0", mail.mime_version.to_s
     assert_equal "multipart/alternative", mail.content_type.string
-    assert_equal "application/x-yaml", mail.parts[0].content_type.string
+    assert_equal "text/plain", mail.parts[0].content_type.string
     assert_equal "utf-8", mail.parts[0].charset
-    assert_equal "text/plain", mail.parts[1].content_type.string
+    assert_equal "text/html", mail.parts[1].content_type.string
     assert_equal "utf-8", mail.parts[1].charset
-    assert_equal "text/html", mail.parts[2].content_type.string
+    assert_equal "application/x-yaml", mail.parts[2].content_type.string
     assert_equal "utf-8", mail.parts[2].charset
   end
 
@@ -941,9 +974,9 @@ EOF
 
     mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["application/x-yaml", "text/plain"])
     assert_equal 3, mail.parts.length
-    assert_equal "text/html", mail.parts[0].content_type.string
+    assert_equal "application/x-yaml", mail.parts[0].content_type.string
     assert_equal "text/plain", mail.parts[1].content_type.string
-    assert_equal "application/x-yaml", mail.parts[2].content_type.string
+    assert_equal "text/html", mail.parts[2].content_type.string
   end
 
   def test_implicitly_multipart_messages_with_charset
@@ -963,19 +996,19 @@ EOF
 
   def test_html_mail_with_underscores
     mail = TestMailer.create_html_mail_with_underscores(@recipient)
-    assert_equal %{<a href="http://google.com" target="_blank">_Google</a>}, mail.body.decoded
+    assert_equal %{<a href="http://google.com" target="_blank">_Google</a>}, mail.body.to_s
   end
 
   def test_various_newlines
     mail = TestMailer.create_various_newlines(@recipient)
     assert_equal("line #1\nline #2\nline #3\nline #4\n\n" +
-                 "line #5\n\nline#6\n\nline #7", mail.body.decoded)
+                 "line #5\n\nline#6\n\nline #7", mail.body.to_s)
   end
 
   def test_various_newlines_multipart
     mail = TestMailer.create_various_newlines_multipart(@recipient)
-    assert_equal "line #1\nline #2\nline #3\nline #4\n\n", mail.parts[0].body.decoded
-    assert_equal "<p>line #1</p>\n<p>line #2</p>\n<p>line #3</p>\n<p>line #4</p>\n\n", mail.parts[1].body.decoded
+    assert_equal "line #1\nline #2\nline #3\nline #4\n\n", mail.parts[0].body.to_s
+    assert_equal "<p>line #1</p>\n<p>line #2</p>\n<p>line #3</p>\n<p>line #4</p>\n\n", mail.parts[1].body.to_s
     assert_equal "line #1\r\nline #2\r\nline #3\r\nline #4\r\n\r\n", mail.parts[0].body.encoded
     assert_equal "<p>line #1</p>\r\n<p>line #2</p>\r\n<p>line #3</p>\r\n<p>line #4</p>\r\n\r\n", mail.parts[1].body.encoded
   end
@@ -1008,7 +1041,7 @@ EOF
     mail = Mail.new(fixture)
     assert_equal(2, mail.parts.length)
     assert_equal(4, mail.parts.first.parts.length)
-    assert_equal("This is the first part.", mail.parts.first.parts.first.body.decoded)
+    assert_equal("This is the first part.", mail.parts.first.parts.first.body.to_s)
     assert_equal("test.rb", mail.parts.first.parts.second.filename)
     assert_equal("flowed", mail.parts.first.parts.fourth.content_type.parameters[:format])
     assert_equal('smime.p7s', mail.parts.second.filename)
@@ -1074,7 +1107,7 @@ EOF
 
   def test_return_path_with_create
     mail = TestMailer.create_return_path
-    assert_equal "another@somewhere.test", mail['return-path'].decoded.to_s
+    assert_equal "another@somewhere.test", mail['return-path'].to_s
   end
 
   def test_return_path_with_deliver
@@ -1085,8 +1118,9 @@ EOF
   end
 
   def test_body_is_stored_as_an_ivar
-    mail = TestMailer.create_body_ivar(@recipient)
-    assert_equal "body: foo\nbar: baz", mail.body.decoded
+    mail = nil
+    ActiveSupport::Deprecation.silence { mail = TestMailer.create_body_ivar(@recipient) }
+    assert_equal "body: foo\nbar: baz", mail.body.to_s
   end
 
   def test_starttls_is_enabled_if_supported
@@ -1215,6 +1249,6 @@ class RespondToTest < Test::Unit::TestCase
       RespondToMailer.not_a_method
     end
 
-    assert_match /undefined method.*not_a_method/, error.message
+    assert_match(/undefined method.*not_a_method/, error.message)
   end
 end
diff --git a/actionmailer/test/tmail_test.rb b/actionmailer/test/mail_test.rb
index 5d895f3790..ea6f25d157 100644
--- a/actionmailer/test/tmail_test.rb
+++ b/actionmailer/test/mail_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class TMailMailTest < Test::Unit::TestCase
+class MailTest < Test::Unit::TestCase
   def test_body
     m = Mail.new
     expected = 'something_with_underscores'
@@ -8,8 +8,8 @@ class TMailMailTest < Test::Unit::TestCase
     quoted_body = [expected].pack('*M')
     m.body = quoted_body
     assert_equal "something_with_underscores=\r\n", m.body.encoded
-    # CHANGED: body returns object, not string, Changed m.body to m.body.decoded
-    assert_equal expected, m.body.decoded
+    # CHANGED: body returns object, not string, Changed m.body to m.body.to_s
+    assert_equal expected, m.body.to_s
   end
 
   def test_nested_attachments_are_recognized_correctly
diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb
index 32f34f6028..b16d160805 100644
--- a/actionmailer/test/quoting_test.rb
+++ b/actionmailer/test/quoting_test.rb
@@ -71,7 +71,7 @@ class QuotingTest < Test::Unit::TestCase
     mail = Mail.new(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_quoted_with_0d0a"))
     # CHANGED: subject returns an object now
     # assert_match %r{Elapsed time}, mail.body
-    assert_match %r{Elapsed time}, mail.body.decoded
+    assert_match %r{Elapsed time}, mail.body.to_s
   end
 
   def test_email_with_partially_quoted_subject
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index 8e4254411c..86d22da9bf 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -92,7 +92,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
       end
     end
     
-    assert_match /2 .* but 1/, error.message
+    assert_match(/2 .* but 1/, error.message)
   end
   
   def test_assert_emails_too_many_sent
@@ -103,7 +103,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
       end
     end
     
-    assert_match /1 .* but 2/, error.message
+    assert_match(/1 .* but 2/, error.message)
   end
   
   def test_assert_no_emails_failure
@@ -113,7 +113,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
       end
     end
     
-    assert_match /0 .* but 1/, error.message
+    assert_match(/0 .* but 1/, error.message)
   end
 end
 
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 427833b36c..12bf609dce 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -1,7 +1,9 @@
 require 'abstract_unit'
 
-class TestMailer < ActionMailer::Base
+class WelcomeController < ActionController::Base
+end
 
+class TestMailer < ActionMailer::Base
   default_url_options[:host] = 'www.basecamphq.com'
 
   def signed_up_with_url(recipient)
@@ -10,8 +12,8 @@ class TestMailer < ActionMailer::Base
     @from         = "system@loudthinking.com"
     @sent_on      = Time.local(2004, 12, 12)
 
-    @body["recipient"]   = recipient
-    @body["welcome_url"] = url_for :host => "example.com", :controller => "welcome", :action => "greeting"
+    @recipient   = recipient
+    @welcome_url = url_for :host => "example.com", :controller => "welcome", :action => "greeting"
   end
 
   class <<self
@@ -52,27 +54,31 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def test_signed_up_with_url
-    ActionController::Routing.use_controllers! ['welcome'] do
-      ActionController::Routing::Routes.draw do |map|
-        map.connect ':controller/:action/:id'
-        map.welcome 'welcome', :controller=>"foo", :action=>"bar"
-      end
-
-      expected = new_mail
-      expected.to      = @recipient
-      expected.subject = "[Signed up] Welcome #{@recipient}"
-      expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
-      expected.from    = "system@loudthinking.com"
-      expected.date    = Time.local(2004, 12, 12)
-
-      created = nil
-      assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
-      assert_not_nil created
-      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
+    ActionController::Routing::Routes.draw do |map|
+      map.connect ':controller/:action/:id'
+      map.welcome 'welcome', :controller=>"foo", :action=>"bar"
     end
+
+    expected = new_mail
+    expected.to      = @recipient
+    expected.subject = "[Signed up] Welcome #{@recipient}"
+    expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
+    expected.from    = "system@loudthinking.com"
+    expected.date    = Time.local(2004, 12, 12)
+
+    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
+    delivered = ActionMailer::Base.deliveries.first
+    
+    delivered.message_id = '<123@456>'
+    assert_equal expected.encoded, delivered.encoded
   end
 end