Ticket #9136: fix_symlinked_view_paths.diff

a/vendor/rails/actionpack/lib/action_view/template_finder.rb

@@ -23 +23 @@
-      def process_view_paths(*view_paths)
-        view_paths.flatten.compact.each do |dir|
-          next if @@processed_view_paths.has_key?(dir)
-
-          @@processed_view_paths[dir] = []
-
+/**
-            unless File.directory?(file)
-              @@processed_view_paths[dir] << file.split(dir).last.sub(/^\//, '')
-

a/vendor/rails/actionpack/test/controller/layout_test.rb

@@ -238 +238 @@
-    assert_response 401
-  end
-end
+
+class LayoutSymlinkedTest < LayoutTest
+  layout "symlinked/symlinked_layout"
+end
+
+class LayoutSymlinkedIsRenderedTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_symlinked_layout_is_rendered
+    @controller = LayoutSymlinkedTest.new
+    get :hello
+    assert_response 200
+    assert_equal "layouts/symlinked/symlinked_layout", @response.layout
+  end
+end
+    

/dev/null

@@ +1 @@
+This is my layout
+
+<%= yield %>
+
+End.

a/vendor/rails/actionpack/test/template/template_finder_test.rb

@@ -21 +21 @@
-    assert_equal ["builder", "erb", "rhtml", "rjs", "rxml", "mab"].sort,
-                 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort
-
-
+/*
-                 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]
-
-  
+/**
+
-  end
-
-  def test_find_template_extension_from_first_render
@@ -62 +62 @@
-    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")