aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-01 12:38:08 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-01 12:38:08 -0300
commitbd83caa66680380685a3961339c81b77ab1e85ff (patch)
treef67b08114b175cdeb3be1eca2b84e7cb5ab35a96 /actionpack/test/fixtures
parent03ddab096f42d4dea191b4b4da5709a4ac723884 (diff)
parent4abe29d813bf3212b2d6d2af9e17caa337330a15 (diff)
downloadrails-bd83caa66680380685a3961339c81b77ab1e85ff.tar.gz
rails-bd83caa66680380685a3961339c81b77ab1e85ff.tar.bz2
rails-bd83caa66680380685a3961339c81b77ab1e85ff.zip
Merge pull request #20284 from kaspth/fix-caching-test
Move expectation to instance level.
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/customers/_commented_customer.html.erb1
-rw-r--r--actionpack/test/fixtures/customers/_customer.html.erb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/customers/_commented_customer.html.erb b/actionpack/test/fixtures/customers/_commented_customer.html.erb
index d5f6e3b491..8cc9c1ec13 100644
--- a/actionpack/test/fixtures/customers/_commented_customer.html.erb
+++ b/actionpack/test/fixtures/customers/_commented_customer.html.erb
@@ -1,4 +1,5 @@
<%# I'm a comment %>
<% cache customer do %>
+ <% controller.partial_rendered_times += 1 %>
<%= customer.name %>, <%= customer.id %>
<% end %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/customers/_customer.html.erb b/actionpack/test/fixtures/customers/_customer.html.erb
index 67e9f6d411..5105090d4b 100644
--- a/actionpack/test/fixtures/customers/_customer.html.erb
+++ b/actionpack/test/fixtures/customers/_customer.html.erb
@@ -1,3 +1,4 @@
<% cache customer do %>
+ <% controller.partial_rendered_times += 1 %>
<%= customer.name %>, <%= customer.id %>
<% end %> \ No newline at end of file