Fix layouts in symlinked paths. Closes #9136 [court3nay, caio]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb
index 296815f4cb..a162640de3 100644
--- a/actionpack/test/template/template_finder_test.rb
+++ b/actionpack/test/template/template_finder_test.rb
@@ -21,14 +21,14 @@ class TemplateFinderTest < Test::Unit::TestCase
     assert_equal ["builder", "erb", "rhtml", "rjs", "rxml", "mab"].sort,
                  ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort
 
-    assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*.{erb,rjs,rhtml,builder,rxml,mab}").size,
+    assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*/*.{erb,rjs,rhtml,builder,rxml,mab}").size,
                  ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].keys.size
   end
 
   def test_should_cache_dir_content_properly
     assert ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT]
-    assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*").find_all {|f| !File.directory?(f) }.size,
-                 ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size
+    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
@@ -62,7 +62,7 @@ class TemplateFinderTest < Test::Unit::TestCase
     assert_equal false, @finder.send(:file_exists?, 'baz')
     assert_equal false, @finder.send(:file_exists?, 'baz.rb')
   end
-
+  
   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")