diff options
| author | Javan Makhmali <javan@javan.us> | 2016-06-15 16:25:58 -0400 |
|---|---|---|
| committer | Javan Makhmali <javan@javan.us> | 2016-06-15 18:25:18 -0400 |
| commit | 1717836e4fbc111d4b339aff875b2a3c301ab7e3 (patch) | |
| tree | ce526b38d8ae9ddcb43e2c16001f1c6edbb6d35b /actionview | |
| parent | 2451177f37aa252513ac372d24cba6a3c44c054b (diff) | |
| download | rails-1717836e4fbc111d4b339aff875b2a3c301ab7e3.tar.gz rails-1717836e4fbc111d4b339aff875b2a3c301ab7e3.tar.bz2 rails-1717836e4fbc111d4b339aff875b2a3c301ab7e3.zip | |
Explicity find with the rendered format to handle searching multiple view paths correctly
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/digestor.rb | 4 | ||||
| -rw-r--r-- | actionview/test/fixtures/digestor/api/comments/_comment.json.erb (renamed from actionview/test/fixtures/digestor/comments/_comment.json.erb) | 0 | ||||
| -rw-r--r-- | actionview/test/template/digestor_test.rb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index bc42b5dae1..8d174955a1 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -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) } diff --git a/actionview/test/fixtures/digestor/comments/_comment.json.erb b/actionview/test/fixtures/digestor/api/comments/_comment.json.erb index 696eb13917..696eb13917 100644 --- a/actionview/test/fixtures/digestor/comments/_comment.json.erb +++ b/actionview/test/fixtures/digestor/api/comments/_comment.json.erb diff --git a/actionview/test/template/digestor_test.rb b/actionview/test/template/digestor_test.rb index 3dad70f464..a06f681eda 100644 --- a/actionview/test/template/digestor_test.rb +++ b/actionview/test/template/digestor_test.rb @@ -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 |