2 files changed, 14 insertions, 31 deletions
diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb
index dde757b5a2..bfab97cf1e 100644
--- a/actionview/test/template/digestor_test.rb
+++ b/actionview/test/template/digestor_test.rb
@@ -13,34 +13,11 @@ class FixtureTemplate
   end
 end
 
-class FixtureFinder
+class FixtureFinder < ActionView::LookupContext
   FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"
 
-  attr_reader   :details, :view_paths
-  attr_accessor :formats
-  attr_accessor :variants
-
-  def initialize
-    @details  = {}
-    @view_paths = ActionView::PathSet.new(['digestor'])
-    @formats  = []
-    @variants = []
-  end
-
-  def details_key
-    details.hash
-  end
-
-  def find(name, prefixes = [], partial = false, keys = [], options = {})
-    partial_name = partial ? name.gsub(%r|/([^/]+)$|, '/_\1') : name
-    format = @formats.first.to_s
-    format += "+#{@variants.first}" if @variants.any?
-
-    FixtureTemplate.new("digestor/#{partial_name}.#{format}.erb")
-  end
-
-  def disable_cache(&block)
-    yield
+  def initialize(details = {})
+    super(ActionView::PathSet.new(['digestor']), details, [])
   end
 end
 
@@ -206,13 +183,14 @@ class TemplateDigestorTest < ActionView::TestCase
 
   def test_details_are_included_in_cache_key
     # Cache the template digest.
+    @finder = FixtureFinder.new({:formats => [:html]})
     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"
+    @finder = FixtureFinder.new
 
     # The cache is busted.
     assert_not_equal old_digest, digest("events/_event")
@@ -317,25 +295,24 @@ class TemplateDigestorTest < ActionView::TestCase
 
       yield
 
-      assert previous_digest != digest(template_name, options), "digest didn't change"
+      assert_not_equal previous_digest, digest(template_name, options), "digest didn't change"
       ActionView::Digestor.cache.clear
     end
 
     def digest(template_name, options = {})
       options = options.dup
 
-      finder.formats  = [:html]
       finder.variants = options.delete(:variants) || []
 
       ActionView::Digestor.digest({ name: template_name, finder: finder }.merge(options))
     end
 
     def dependencies(template_name)
-      ActionView::Digestor.new({ name: template_name, finder: finder }).dependencies
+      ActionView::Digestor.new(template_name, finder).dependencies
     end
 
     def nested_dependencies(template_name)
-      ActionView::Digestor.new({ name: template_name, finder: finder }).nested_dependencies
+      ActionView::Digestor.new(template_name, finder).nested_dependencies
     end
 
     def finder
diff --git a/actionview/test/template/tag_helper_test.rb b/actionview/test/template/tag_helper_test.rb
index 6f7a78ccef..f3956a31f6 100644
--- a/actionview/test/template/tag_helper_test.rb
+++ b/actionview/test/template/tag_helper_test.rb
@@ -173,4 +173,10 @@ class TagHelperTest < ActionView::TestCase
         tag('a', { aria => { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' } })
     }
   end
+
+  def test_link_to_data_nil_equal
+    div_type1 = content_tag(:div, 'test', { 'data-tooltip' => nil })
+    div_type2 = content_tag(:div, 'test', { data: {tooltip: nil} })
+    assert_dom_equal div_type1, div_type2 
+  end
 end