mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Process view paths passed to AV::Base#initialize instead of raising.
This commit is contained in:
parent
c88f2b5e23
commit
057768cd2c
2 changed files with 1 additions and 16 deletions
|
@ -1,14 +1,5 @@
|
|||
module ActionView #:nodoc:
|
||||
class TemplateFinder #:nodoc:
|
||||
|
||||
class InvalidViewPath < StandardError #:nodoc:
|
||||
attr_reader :unprocessed_path
|
||||
def initialize(path)
|
||||
@unprocessed_path = path
|
||||
super("Unprocessed view path found: #{@unprocessed_path.inspect}. Set your view paths with #append_view_path, #prepend_view_path, or #view_paths=.")
|
||||
end
|
||||
end
|
||||
|
||||
cattr_reader :processed_view_paths
|
||||
@@processed_view_paths = Hash.new {|hash, key| hash[key] = []}
|
||||
|
||||
|
@ -76,7 +67,7 @@ module ActionView #:nodoc:
|
|||
|
||||
@view_paths = args.flatten
|
||||
@view_paths = @view_paths.respond_to?(:find) ? @view_paths.dup : [*@view_paths].compact
|
||||
check_view_paths(@view_paths)
|
||||
self.class.process_view_paths(@view_paths)
|
||||
end
|
||||
|
||||
def prepend_view_path(path)
|
||||
|
|
|
@ -11,12 +11,6 @@ class TemplateFinderTest < Test::Unit::TestCase
|
|||
@finder = ActionView::TemplateFinder.new(@template, LOAD_PATH_ROOT)
|
||||
end
|
||||
|
||||
def test_should_raise_exception_for_unprocessed_view_path
|
||||
assert_raises ActionView::TemplateFinder::InvalidViewPath do
|
||||
ActionView::TemplateFinder.new(@template, File.dirname(__FILE__))
|
||||
end
|
||||
end
|
||||
|
||||
def test_should_cache_file_extension_properly
|
||||
assert_equal ["builder", "erb", "rhtml", "rjs", "rxml", "mab"].sort,
|
||||
ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort
|
||||
|
|
Loading…
Reference in a new issue