aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
diff options
context:
space:
mode:
authorDieter Komendera <dieter@komendera.com>2011-07-19 17:02:22 +0200
committerDieter Komendera <dieter@komendera.com>2011-07-23 23:41:33 +0200
commit8ae7008ac3d77cca42350007e99efe672e7b8e40 (patch)
treeb97eb9cbfd98d64c020f8f440f03a67b994db4d6 /actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
parent410e75419d2ffdee56a465eb551f868af7063176 (diff)
downloadrails-8ae7008ac3d77cca42350007e99efe672e7b8e40.tar.gz
rails-8ae7008ac3d77cca42350007e99efe672e7b8e40.tar.bz2
rails-8ae7008ac3d77cca42350007e99efe672e7b8e40.zip
Fix fragment cache helper regression on cache miss introduced with 03d01ec7.
Contains following patches cherry-picked from @lhahne's 3-0-stable branch: * Added tests for the output_buffer returned by CacheHelper (c476a6b) The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe. * made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)
Diffstat (limited to 'actionpack/test/fixtures/functional_caching/fragment_cached.html.erb')
-rw-r--r--actionpack/test/fixtures/functional_caching/fragment_cached.html.erb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
index c479adb897..fa5e6bd318 100644
--- a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
+++ b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
@@ -1,2 +1,3 @@
Hello
<%= cache do %>This bit's fragment cached<% end %>
+<%= 'Ciao' %>