Fixed render :template for templates in top level of view path. [#54 state:resolved]

1 files changed, 3 insertions, 2 deletions

diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb
index a162640de3..3d6baff5fb 100644
--- a/actionpack/test/template/template_finder_test.rb
+++ b/actionpack/test/template/template_finder_test.rb
@@ -21,13 +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}") |
+                  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,
+    assert_equal (Dir.glob("#{LOAD_PATH_ROOT}/**/*/**") | Dir.glob("#{LOAD_PATH_ROOT}/**")).find_all {|f| !File.directory?(f) }.size,
                ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size
   end