aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@basecamp.com>2014-03-04 16:15:26 +0100
committerDavid Heinemeier Hansson <david@basecamp.com>2014-03-04 16:15:26 +0100
commit705915ab5cf24430892107764b0050c07e1df583 (patch)
tree066275df7d4ce82bcc7901bdfb75bfc21cd74b08 /actionpack/test
parentab1bd7ccf1cc38d271747dd95433a93b28a6e302 (diff)
parent1858cc60701dcfb801b9634a1da0177eaeba3807 (diff)
downloadrails-705915ab5cf24430892107764b0050c07e1df583.tar.gz
rails-705915ab5cf24430892107764b0050c07e1df583.tar.bz2
rails-705915ab5cf24430892107764b0050c07e1df583.zip
Merge pull request #14243 from pch/digestor-variants
Variants in ActionView::Digestor
Diffstat (limited to 'actionpack/test')
-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