kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

use a real LookupContext in the digest tests

Browse source 
This will ensure that the digestor stays in parity with the
LookupContext object.
This commit is contained in:
Aaron Patterson 2016-02-12 12:11:56 -08:00
parent 914e2002d8
commit 3d7892d4d5
1 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
actionview/test/template/digestor_test.rb
View file

@ -13,34 +13,12 @@ class FixtureTemplate
end end
end end
class FixtureFinder class FixtureFinder < ActionView::LookupContext
FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor" FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"
attr_reader :details, :view_paths def initialize(details = {})
attr_accessor :formats prefixes = [FixtureFinder::FIXTURES_DIR]
attr_accessor :variants super(ActionView::PathSet.new(['digestor']), details, prefixes)
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
end end
end end
@ -206,13 +184,14 @@ class TemplateDigestorTest < ActionView::TestCase
def test_details_are_included_in_cache_key def test_details_are_included_in_cache_key
# Cache the template digest. # Cache the template digest.
@finder = FixtureFinder.new({:formats => [:html]})
old_digest = digest("events/_event") old_digest = digest("events/_event")
# Change the template; the cached digest remains unchanged. # Change the template; the cached digest remains unchanged.
change_template("events/_event") change_template("events/_event")
# The details are changed, so a new cache key is generated. # The details are changed, so a new cache key is generated.
finder.details[:foo] = "bar" @finder = FixtureFinder.new
# The cache is busted. # The cache is busted.
assert_not_equal old_digest, digest("events/_event") assert_not_equal old_digest, digest("events/_event")
@ -324,7 +303,6 @@ class TemplateDigestorTest < ActionView::TestCase
def digest(template_name, options = {}) def digest(template_name, options = {})
options = options.dup options = options.dup
finder.formats = [:html]
finder.variants = options.delete(:variants) || [] finder.variants = options.delete(:variants) || []
ActionView::Digestor.digest({ name: template_name, finder: finder }.merge(options)) ActionView::Digestor.digest({ name: template_name, finder: finder }.merge(options))