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

Explicity find with the rendered format to handle searching multiple view paths correctly

Browse source
This commit is contained in:
Javan Makhmali 2016-06-15 16:25:58 -04:00
parent 2451177f37
commit 1717836e4f
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionview/lib/action_view/digestor.rb
View file

@ -38,9 +38,7 @@ module ActionView
# Create a dependency tree for template named +name+.
def tree(name, finder, partial = false, seen = {})
logical_name = name.gsub(%r|/_|, "/")
format = finder.rendered_format
formats = finder.formats.without(format).unshift(format)
formats = [finder.rendered_format]
if finder.disable_cache { finder.exists?(logical_name, [], partial, [], formats: formats) }
template = finder.disable_cache { finder.find(logical_name, [], partial, [], formats: formats) }

0
actionview/test/fixtures/digestor/comments/_comment.json.erb → actionview/test/fixtures/digestor/api/comments/_comment.json.erb vendored
View file

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

@ -17,7 +17,7 @@ class FixtureFinder < ActionView::LookupContext
FIXTURES_DIR = "#{File.dirname(__FILE__)}/../fixtures/digestor"
def initialize(details = {})
super(ActionView::PathSet.new(['digestor']), details, [])
super(ActionView::PathSet.new(['digestor', 'digestor/api']), details, [])
@rendered_format = :html
end
end