aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorDave Gynn <davegynn@gmail.com>2015-12-26 22:25:27 -0800
committerDave Gynn <davegynn@gmail.com>2015-12-26 22:37:31 -0800
commit837e40dcac023319a0bfc38240761d4352b73b99 (patch)
tree3b98c30c02e7f01d41e7902aa72e85c168de2068 /actionpack/test/fixtures
parentc56e56773815221ef1fbd127f949c3e5207ea471 (diff)
downloadrails-837e40dcac023319a0bfc38240761d4352b73b99.tar.gz
rails-837e40dcac023319a0bfc38240761d4352b73b99.tar.bz2
rails-837e40dcac023319a0bfc38240761d4352b73b99.zip
restore ability to pass extra options to cache stores
The `cache` helper methods should pass any extra options to the cache store. For example :expires_in would be a valid option if memcache was the cache store. The change in commit da16745 broke the ability to pass any options other than :skip_digest and :virtual_path. This PR restores that functionality and adds a test for it.
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/functional_caching/fragment_cached_with_options.html.erb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/functional_caching/fragment_cached_with_options.html.erb b/actionpack/test/fixtures/functional_caching/fragment_cached_with_options.html.erb
new file mode 100644
index 0000000000..6865df9b7e
--- /dev/null
+++ b/actionpack/test/fixtures/functional_caching/fragment_cached_with_options.html.erb
@@ -0,0 +1,3 @@
+<body>
+<%= cache 'with_options', :skip_digest => true, :expires_in => 1.minute do %><p>ERB</p><% end %>
+</body>