From 37586ddf279c46c3d0c8c2553d0918aa82ceb020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 28 Oct 2012 12:55:53 -0700
Subject: Merge pull request #8048 from
 senny/7761_dont_render_view_without_mail_call

Do not render views when mail() isn't called. (NullMail refactoring)
Conflicts:
	actionmailer/CHANGELOG.md
---
 actionmailer/test/base_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionmailer/test/base_test.rb')

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index d92fc01ef8..b69b26faf0 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -471,6 +471,12 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal(%{<img alt="Dummy" src="http://local.com/images/dummy.png" />}, mail.body.to_s.strip)
   end
 
+  test 'the view is not rendered when mail was never called' do
+    mail = BaseMailer.without_mail_call
+    assert_equal('', mail.body.to_s.strip)
+    mail.deliver
+  end
+
   # Before and After hooks
 
   class MyObserver
-- 
cgit v1.2.3