Changeset 9089
- Timestamp:
- 03/25/08 21:27:57 (6 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_view/template_finder.rb
r8981 r9089 160 160 161 161 private 162 163 def check_view_paths(view_paths)164 view_paths.each do |path|165 raise InvalidViewPath.new(path) unless @@processed_view_paths.has_key?(path)162 def check_view_paths(view_paths) 163 view_paths.each do |path| 164 raise InvalidViewPath.new(path) unless @@processed_view_paths.has_key?(path) 165 end 166 166 end 167 end168 169 167 end 170 168 end trunk/actionpack/test/template/template_finder_test.rb
r9021 r9089 31 31 ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size 32 32 end 33 34 def test_find_template_extension_from_first_render 33 34 def test_find_template_extension_from_first_render 35 35 assert_nil @finder.send(:find_template_extension_from_first_render) 36 36 … … 51 51 end 52 52 end 53 53 54 54 def test_should_report_file_exists_correctly 55 assert_nil @finder.send(:find_template_extension_from_first_render) 55 assert_nil @finder.send(:find_template_extension_from_first_render) 56 56 assert_equal false, @finder.send(:file_exists?, 'test.rhtml') 57 57 assert_equal false, @finder.send(:file_exists?, 'test.rb') 58 58 59 59 @template.instance_variable_set('@first_render', 'foo.rb') 60 61 assert_equal 'rb', @finder.send(:find_template_extension_from_first_render) 60 61 assert_equal 'rb', @finder.send(:find_template_extension_from_first_render) 62 62 assert_equal false, @finder.send(:file_exists?, 'baz') 63 63 assert_equal false, @finder.send(:file_exists?, 'baz.rb') 64 64 end 65 65 66 66 uses_mocha 'Template finder tests' do 67 68 67 def test_should_update_extension_cache_when_template_handler_is_registered 69 68 ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky") 70 69 ActionView::Template::register_template_handler :funky, Class.new(ActionView::TemplateHandler) 71 70 end 72 73 71 end 74 75 72 end
