aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPiotr Chmolowski <piotr@chmolowski.pl>2014-03-01 18:59:56 +0100
committerPiotr Chmolowski <piotr@chmolowski.pl>2014-03-04 15:02:58 +0100
commit1858cc60701dcfb801b9634a1da0177eaeba3807 (patch)
tree046085ccdd7c97b46e2694429ecb45642ad41008 /actionpack
parent8ed0f542ddd1f38b0b42f595d828d2e4db9b6682 (diff)
downloadrails-1858cc60701dcfb801b9634a1da0177eaeba3807.tar.gz
rails-1858cc60701dcfb801b9634a1da0177eaeba3807.tar.bz2
rails-1858cc60701dcfb801b9634a1da0177eaeba3807.zip
Variants in ActionView::Digestor
Take variants into account when calculating template digests in ActionView::Digest. Digestor#digest now takes a hash as an argument to support variants and allow more flexibility in the future. Old-style arguments have been deprecated. Fixes #14242
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/caching_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 57b45b8f7b..591d0eccc3 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -243,8 +243,8 @@ CACHED
end
private
- def template_digest(name, format)
- ActionView::Digestor.digest(name, format, @controller.lookup_context)
+ def template_digest(name, format, variant = nil)
+ ActionView::Digestor.digest(name: name, format: format, variant: variant, finder: @controller.lookup_context)
end
end