Update ActionMailer so it treats ActionView the same way that ActionController does. Closes #10244 [rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 14 insertions, 1 deletions

diff --git a/actionmailer/test/fixtures/test_mailer/subtemplate.text.plain.erb b/actionmailer/test/fixtures/test_mailer/_subtemplate.text.plain.erb
index 3b4ba35f20..3b4ba35f20 100644
--- a/actionmailer/test/fixtures/test_mailer/subtemplate.text.plain.erb
+++ b/actionmailer/test/fixtures/test_mailer/_subtemplate.text.plain.erb
diff --git a/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb b/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb
index de9b2039fa..a93c30ea1a 100644
--- a/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb
+++ b/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb
@@ -1 +1 @@
-Hey Ho, <%= render "subtemplate" %>
\ No newline at end of file
+Hey Ho, <%= render :partial => "subtemplate" %>
\ No newline at end of file
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb
index 0bd5eafd59..475735e7b0 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/mail_render_test.rb
@@ -26,6 +26,13 @@ class RenderMailer < ActionMailer::Base
     subject    "Including another template in the one being rendered"
     from       "tester@example.com"
   end
+  
+  def included_old_subtemplate(recipient)
+    recipients recipient
+    subject    "Including another template in the one being rendered"
+    from       "tester@example.com"
+    body       render(:inline => "Hello, <%= render \"subtemplate\" %>", :body => { :world => "Earth" })
+  end
 
   def initialize_defaults(method_name)
     super
@@ -81,6 +88,12 @@ class RenderHelperTest < Test::Unit::TestCase
     mail = RenderMailer.deliver_included_subtemplate(@recipient)
     assert_equal "Hey Ho, let's go!", mail.body.strip
   end
+  
+  def test_deprecated_old_subtemplate
+    assert_raises ActionView::ActionViewError do
+      RenderMailer.deliver_included_old_subtemplate(@recipient)
+    end
+  end
 end
 
 class FirstSecondHelperTest < Test::Unit::TestCase