aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-02-18 11:25:32 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2016-02-18 11:25:32 -0800
commit9671df3ff797347940da2e813d005a4584ef464e (patch)
tree41f5fa1d10ff5d1aec62261ec57b899fbef78802
parent454bc1deab3b60f6b4cbe36227471ed40f4c38f9 (diff)
parent125e2df1acdc72cf0a4d53a1a36e5a5facb8bed6 (diff)
downloadrails-9671df3ff797347940da2e813d005a4584ef464e.tar.gz
rails-9671df3ff797347940da2e813d005a4584ef464e.tar.bz2
rails-9671df3ff797347940da2e813d005a4584ef464e.zip
Merge pull request #23764 from maclover7/fix-master-build
Fix master build
-rw-r--r--actionpack/test/controller/render_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index c814d4ea54..60c6518c62 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -509,7 +509,7 @@ class EtagRenderTest < ActionController::TestCase
begin
File.write path, 'foo'
- ActionView::Digestor.cache.clear
+ ActionView::LookupContext::DetailsKey.clear
request.if_none_match = etag
get :with_template