Changeset 9120
- Timestamp:
- 03/28/08 20:54:26 (2 months ago)
- Files:
-
- trunk/actionpack/lib/action_view/template_finder.rb (modified) (1 diff)
- trunk/actionpack/test/controller/layout_test.rb (modified) (1 diff)
- trunk/actionpack/test/fixtures/layout_tests/layouts/symlinked (added)
- trunk/actionpack/test/fixtures/symlink_parent (added)
- trunk/actionpack/test/fixtures/symlink_parent/symlinked_layout.erb (added)
- trunk/actionpack/test/template/template_finder_test.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_view/template_finder.rb
r9119 r9120 24 24 view_paths.flatten.compact.each do |dir| 25 25 next if @@processed_view_paths.has_key?(dir) 26 27 26 @@processed_view_paths[dir] = [] 28 Dir.glob("#{dir}/**/* ").each do |file|27 Dir.glob("#{dir}/**/*/**").each do |file| 29 28 unless File.directory?(file) 30 29 @@processed_view_paths[dir] << file.split(dir).last.sub(/^\//, '') trunk/actionpack/test/controller/layout_test.rb
r8981 r9120 239 239 end 240 240 end 241 242 class LayoutSymlinkedTest < LayoutTest 243 layout "symlinked/symlinked_layout" 244 end 245 246 class LayoutSymlinkedIsRenderedTest < Test::Unit::TestCase 247 def setup 248 @request = ActionController::TestRequest.new 249 @response = ActionController::TestResponse.new 250 end 251 252 def test_symlinked_layout_is_rendered 253 @controller = LayoutSymlinkedTest.new 254 get :hello 255 assert_response 200 256 assert_equal "layouts/symlinked/symlinked_layout", @response.layout 257 end 258 end 259 trunk/actionpack/test/template/template_finder_test.rb
r9089 r9120 22 22 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort 23 23 24 assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/* .{erb,rjs,rhtml,builder,rxml,mab}").size,24 assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*/*.{erb,rjs,rhtml,builder,rxml,mab}").size, 25 25 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].keys.size 26 26 end … … 28 28 def test_should_cache_dir_content_properly 29 29 assert ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT] 30 assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/* ").find_all {|f| !File.directory?(f) }.size,31 30 assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*/**").find_all {|f| !File.directory?(f) }.size, 31 ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size 32 32 end 33 33 … … 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 67 def test_should_update_extension_cache_when_template_handler_is_registered
