Ticket #11557: action_mailer_render_message_implicit_body_hash.diff

rails/actionmailer/test/mail_render_test.rb

@@ -12 +12 @@
-    recipients recipient
-    subject    "using helpers"
-    from       "tester@example.com"
-(:file => "signed_up", :body =>
+_message("signed_up",
-  end
+  
+  def file_template_with_implicit_body_hash(recipient)
+    recipients recipient
+    subject    "using helpers"
+    from       "tester@example.com"
+    body[:recipient] = recipient
+    body       render_message("signed_up")
+  end
+  
+  def file_template_without_body_hash(recipient)
+    recipients recipient
+    subject    "using helpers"
+    from       "tester@example.com"
+    body       render_message("signed_up")
+  end
-
-  def rxml_template(recipient)
-    recipients recipient
@@ -78 +93 @@
-    mail = RenderMailer.create_file_template(@recipient)
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
-  end
+  
+  def test_file_template_with_implicit_body_hash
+    mail = RenderMailer.create_file_template_with_implicit_body_hash(@recipient)
+    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
+  end
+  
+  def test_file_template_without_body_hash
+    mail = RenderMailer.create_file_template_without_body_hash(@recipient)
+    assert_equal "Hello there, \n\nMr.", mail.body.strip
+  end
-
-  def test_rxml_template
-    mail = RenderMailer.deliver_rxml_template(@recipient)

rails/actionmailer/lib/action_mailer/base.rb

@@ -502 +502 @@
-        @mime_version = @@default_mime_version.dup if @@default_mime_version
-      end
-
-
+ = @body
-        render :file => method_name, :body => body
-      end
-