1 files changed, 42 insertions, 5 deletions
diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb
index 07f8d36d93..0f6b14a57d 100644
--- a/actionview/test/template/digestor_test.rb
+++ b/actionview/test/template/digestor_test.rb
@@ -15,6 +15,16 @@ end
 class FixtureFinder
   FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"
 
+  attr_reader :details
+
+  def initialize
+    @details = {}
+  end
+
+  def details_key
+    details.hash
+  end
+
   def find(logical_name, keys, partial, options)
     FixtureTemplate.new("digestor/#{partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name}.#{options[:formats].first}.erb")
   end
@@ -100,7 +110,7 @@ class TemplateDigestorTest < ActionView::TestCase
     assert_not_nil digest("level/recursion") # assert digest is stored
   end
 
-  def test_chaning_the_top_templete_on_recursion
+  def test_chaining_the_top_template_on_recursion
     assert digest("level/recursion") # assert recursion is possible
 
     assert_digest_difference("level/recursion") do
@@ -110,7 +120,7 @@ class TemplateDigestorTest < ActionView::TestCase
     assert_not_nil digest("level/recursion") # assert digest is stored
   end
 
-  def test_chaning_the_partial_templete_on_recursion
+  def test_chaining_the_partial_template_on_recursion
     assert digest("level/recursion") # assert recursion is possible
 
     assert_digest_difference("level/recursion") do
@@ -140,6 +150,20 @@ class TemplateDigestorTest < ActionView::TestCase
     end
   end
 
+  def test_details_are_included_in_cache_key
+    # Cache the template digest.
+    old_digest = digest("events/_event")
+
+    # Change the template; the cached digest remains unchanged.
+    change_template("events/_event")
+
+    # The details are changed, so a new cache key is generated.
+    finder.details[:foo] = "bar"
+
+    # The cache is busted.
+    assert_not_equal old_digest, digest("events/_event")
+  end
+
   def test_extra_whitespace_in_render_partial
     assert_digest_difference("messages/edit") do
       change_template("messages/_form")
@@ -184,6 +208,15 @@ class TemplateDigestorTest < ActionView::TestCase
     assert_not_equal digest_phone, digest_fridge_phone
   end
 
+  def test_cache_template_loading
+    resolver_before = ActionView::Resolver.caching
+    ActionView::Resolver.caching = false
+    assert_digest_difference("messages/edit", true) do
+      change_template("comments/_comment")
+    end
+    ActionView::Resolver.caching = resolver_before
+  end
+
   private
     def assert_logged(message)
       old_logger = ActionView::Base.logger
@@ -200,9 +233,9 @@ class TemplateDigestorTest < ActionView::TestCase
       end
     end
 
-    def assert_digest_difference(template_name)
+    def assert_digest_difference(template_name, persistent = false)
       previous_digest = digest(template_name)
-      ActionView::Digestor.cache.clear
+      ActionView::Digestor.cache.clear unless persistent
 
       yield
 
@@ -211,7 +244,11 @@ class TemplateDigestorTest < ActionView::TestCase
     end
 
     def digest(template_name, options={})
-      ActionView::Digestor.digest(template_name, :html, FixtureFinder.new, options)
+      ActionView::Digestor.digest(template_name, :html, finder, options)
+    end
+
+    def finder
+      @finder ||= FixtureFinder.new
     end
 
     def change_template(template_name)