From 20f6f646d130ed3ef28f3632a76ab2502ea3b209 Mon Sep 17 00:00:00 2001
From: Javan Makhmali <javan@javan.us>
Date: Tue, 28 Apr 2015 09:46:17 -0600
Subject: Make ActionMailer #cache helper a no-op, not an exception

---
 actionmailer/test/mail_helper_test.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 24ccaab8df..ff6b25b0c7 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -59,6 +59,12 @@ The second
     end
   end
 
+  def use_cache
+    mail_with_defaults do |format|
+      format.html { render(inline: "<% cache(:foo) do %>Greetings from a cache helper block<% end %>") }
+    end
+  end
+
   protected
 
   def mail_with_defaults(&block)
@@ -107,5 +113,11 @@ class MailerHelperTest < ActionMailer::TestCase
     TEXT
     assert_equal expected.gsub("\n", "\r\n"), mail.body.encoded
   end
-end
 
+  def test_use_cache
+    assert_nothing_raised do
+      mail = HelperMailer.use_cache
+      assert_equal "Greetings from a cache helper block", mail.body.encoded
+    end
+  end
+end
-- 
cgit v1.2.3