1 files changed, 17 insertions, 14 deletions
diff --git a/railties/test/application/per_request_digest_cache_test.rb b/railties/test/application/per_request_digest_cache_test.rb
index 3198e12662..6c003e9bcc 100644
--- a/railties/test/application/per_request_digest_cache_test.rb
+++ b/railties/test/application/per_request_digest_cache_test.rb
@@ -1,9 +1,9 @@
-require 'isolation/abstract_unit'
-require 'rack/test'
-require 'minitest/mock'
+require "isolation/abstract_unit"
+require "rack/test"
+require "minitest/mock"
 
-require 'action_view'
-require 'active_support/testing/method_call_assertions'
+require "action_view"
+require "active_support/testing/method_call_assertions"
 
 class PerRequestDigestCacheTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation
@@ -12,30 +12,32 @@ class PerRequestDigestCacheTest < ActiveSupport::TestCase
 
   setup do
     build_app
-    add_to_config 'config.consider_all_requests_local = true'
+    add_to_config "config.consider_all_requests_local = true"
 
-    app_file 'app/models/customer.rb', <<-RUBY
+    app_file "app/models/customer.rb", <<-RUBY
       class Customer < Struct.new(:name, :id)
         extend ActiveModel::Naming
         include ActiveModel::Conversion
       end
     RUBY
 
-    app_file 'config/routes.rb', <<-RUBY
+    app_file "config/routes.rb", <<-RUBY
       Rails.application.routes.draw do
         resources :customers, only: :index
       end
     RUBY
 
-    app_file 'app/controllers/customers_controller.rb', <<-RUBY
+    app_file "app/controllers/customers_controller.rb", <<-RUBY
       class CustomersController < ApplicationController
+        self.perform_caching = true
+
         def index
           render [ Customer.new('david', 1), Customer.new('dingus', 2) ]
         end
       end
     RUBY
 
-    app_file 'app/views/customers/_customer.html.erb', <<-RUBY
+    app_file "app/views/customers/_customer.html.erb", <<-RUBY
       <% cache customer do %>
         <%= customer.name %>
       <% end %>
@@ -47,16 +49,17 @@ class PerRequestDigestCacheTest < ActiveSupport::TestCase
   teardown :teardown_app
 
   test "digests are reused when rendering the same template twice" do
-    get '/customers'
+    get "/customers"
     assert_equal 200, last_response.status
 
-    assert_equal [ '8ba099b7749542fe765ff34a6824d548' ], ActionView::Digestor.cache.values
+    values = ActionView::LookupContext::DetailsKey.digest_caches.first.values
+    assert_equal [ "8ba099b7749542fe765ff34a6824d548" ], values
     assert_equal %w(david dingus), last_response.body.split.map(&:strip)
   end
 
   test "template digests are cleared before a request" do
-    assert_called(ActionView::Digestor.cache, :clear) do
-      get '/customers'
+    assert_called(ActionView::LookupContext::DetailsKey, :clear) do
+      get "/customers"
       assert_equal 200, last_response.status
     end
   end