diff options
| -rw-r--r-- | actionpack/lib/action_view/template_finder.rb | 10 | ||||
| -rw-r--r-- | actionpack/test/template/template_finder_test.rb | 17 |
2 files changed, 11 insertions, 16 deletions
diff --git a/actionpack/lib/action_view/template_finder.rb b/actionpack/lib/action_view/template_finder.rb index f483d24a2f..69832e9b4c 100644 --- a/actionpack/lib/action_view/template_finder.rb +++ b/actionpack/lib/action_view/template_finder.rb @@ -159,12 +159,10 @@ module ActionView #:nodoc: end private - - def check_view_paths(view_paths) - view_paths.each do |path| - raise InvalidViewPath.new(path) unless @@processed_view_paths.has_key?(path) + def check_view_paths(view_paths) + view_paths.each do |path| + raise InvalidViewPath.new(path) unless @@processed_view_paths.has_key?(path) + end end - end - end end diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb index 8640d22e02..296815f4cb 100644 --- a/actionpack/test/template/template_finder_test.rb +++ b/actionpack/test/template/template_finder_test.rb @@ -30,8 +30,8 @@ class TemplateFinderTest < Test::Unit::TestCase assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*").find_all {|f| !File.directory?(f) }.size, ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size end - - def test_find_template_extension_from_first_render + + def test_find_template_extension_from_first_render assert_nil @finder.send(:find_template_extension_from_first_render) { @@ -50,26 +50,23 @@ class TemplateFinderTest < Test::Unit::TestCase assert_equal expectation, @finder.send(:find_template_extension_from_first_render) end end - + def test_should_report_file_exists_correctly - assert_nil @finder.send(:find_template_extension_from_first_render) + assert_nil @finder.send(:find_template_extension_from_first_render) assert_equal false, @finder.send(:file_exists?, 'test.rhtml') assert_equal false, @finder.send(:file_exists?, 'test.rb') @template.instance_variable_set('@first_render', 'foo.rb') - - assert_equal 'rb', @finder.send(:find_template_extension_from_first_render) + + assert_equal 'rb', @finder.send(:find_template_extension_from_first_render) assert_equal false, @finder.send(:file_exists?, 'baz') assert_equal false, @finder.send(:file_exists?, 'baz.rb') end - - uses_mocha 'Template finder tests' do + uses_mocha 'Template finder tests' do def test_should_update_extension_cache_when_template_handler_is_registered ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky") ActionView::Template::register_template_handler :funky, Class.new(ActionView::TemplateHandler) end - end - end |