Break a window :/

b65b9897 · Jeremy Kemper · 748c78ff · b65b9897 · b65b9897 · b65b9897
5 changed file
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -726,7 +726,7 @@ def test_fragment_caching_in_rjs_partials
  def test_html_formatted_fragment_caching
    get :formatted_fragment_cached, :format => "html"
    assert_response :success
-    expected_body = "<body>\n<p>ERB</p>\n</body>"
+    expected_body = "<body>\n<p>ERB</p>\n</body>\n"

    assert_equal expected_body, @response.body


--- a/actionpack/test/fixtures/functional_caching/_partial.erb
+++ b/actionpack/test/fixtures/functional_caching/_partial.erb
 <% cache do %>
-Fragment caching in a partial
-<% end %>
\ No newline at end of file
+Old fragment caching in a partial
+<% end %>
--- a/actionpack/test/fixtures/functional_caching/formatted_fragment_cached.html.erb
+++ b/actionpack/test/fixtures/functional_caching/formatted_fragment_cached.html.erb
 <body>
-<% cache do %><p>ERB</p><% end %>
-</body>
\ No newline at end of file
+<%= cache do %><p>ERB</p><% end %>
+</body>
--- a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
+++ b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
 Hello
-<% cache do %>This bit's fragment cached<% end %>
+<%= cache do %>This bit's fragment cached<% end %>
--- a/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb
+++ b/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb
 <%= render :inline => 'Some inline content' %>
-<% cache do %>Some cached content<% end %>
+<%= cache do %>Some cached content<% end %>