1 files changed, 9 insertions, 38 deletions
diff --git a/actionmailer/test/old_base/mail_render_test.rb b/actionmailer/test/old_base/mail_render_test.rb
index 7ba55b1bd2..4213c2a173 100644
--- a/actionmailer/test/old_base/mail_render_test.rb
+++ b/actionmailer/test/old_base/mail_render_test.rb
@@ -7,7 +7,7 @@ class RenderMailer < ActionMailer::Base
     from       "tester@example.com"
 
     @world = "Earth"
-    render :inline => "Hello, <%= @world %>"
+    body       render(:inline => "Hello, <%= @world %>")
   end
 
   def file_template
@@ -16,16 +16,7 @@ class RenderMailer < ActionMailer::Base
     from       "tester@example.com"
 
     @recipient = 'test@localhost'
-    render :file => "templates/signed_up"
-  end
-
-  def implicit_body
-    recipients 'test@localhost'
-    subject    "using helpers"
-    from       "tester@example.com"
-
-    @recipient = 'test@localhost'
-    render :template => "templates/signed_up"
+    body       render(:file => "templates/signed_up")
   end
 
   def rxml_template
@@ -40,21 +31,13 @@ class RenderMailer < ActionMailer::Base
     from       "tester@example.com"
   end
 
-  def mailer_accessor
-    recipients 'test@localhost'
-    subject    "Mailer Accessor"
-    from       "tester@example.com"
-
-    render :inline => "Look, <%= mailer.subject %>!"
-  end
-
   def no_instance_variable
     recipients 'test@localhost'
     subject    "No Instance Variable"
     from       "tester@example.com"
 
     silence_warnings do
-      render :inline => "Look, subject.nil? is <%= @subject.nil? %>!"
+      body render(:inline => "Look, subject.nil? is <%= @subject.nil? %>!")
     end
   end
 
@@ -81,13 +64,11 @@ class RenderMailer < ActionMailer::Base
 
       part "text/html" do |p|
         p.body = build_body_part('html', assigns)
-        p.transfer_encoding = "base64"
       end
     end
 
     def build_body_part(content_type, assigns, options = {})
       render "#{template}.#{content_type}", :body => assigns
-      # render options.merge(:file => "#{template}.#{content_type}", :body => assigns)
     end
 end
 
@@ -122,11 +103,6 @@ class RenderHelperTest < Test::Unit::TestCase
     restore_delivery_method
   end
 
-  def test_implicit_body
-    mail = RenderMailer.implicit_body
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
-  end
-
   def test_inline_template
     mail = RenderMailer.inline_template
     assert_equal "Hello, Earth", mail.body.to_s.strip
@@ -147,11 +123,6 @@ class RenderHelperTest < Test::Unit::TestCase
     assert_equal "Hey Ho, let's go!", mail.body.to_s.strip
   end
 
-  def test_mailer_accessor
-    mail = RenderMailer.mailer_accessor.deliver
-    assert_equal "Look, Mailer Accessor!", mail.body.to_s.strip
-  end
-
   def test_no_instance_variable
     mail = RenderMailer.no_instance_variable.deliver
     assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
@@ -159,12 +130,12 @@ class RenderHelperTest < Test::Unit::TestCase
 
   def test_legacy_multipart_alternative
     mail = RenderMailer.multipart_alternative.deliver
-    assert_equal(2, email.parts.size)
-    assert_equal("multipart/alternative", email.mime_type)
-    assert_equal("text/plain", email.parts[0].mime_type)
-    assert_equal("foo: bar", email.parts[0].body.encoded)
-    assert_equal("text/html", email.parts[1].mime_type)
-    assert_equal("<strong>foo</strong> bar", email.parts[1].body.encoded)
+    assert_equal(2, mail.parts.size)
+    assert_equal("multipart/alternative", mail.mime_type)
+    assert_equal("text/plain", mail.parts[0].mime_type)
+    assert_equal("foo: bar", mail.parts[0].body.encoded)
+    assert_equal("text/html", mail.parts[1].mime_type)
+    assert_equal("<strong>foo</strong> bar", mail.parts[1].body.encoded)
   end
 end