From 3191535ff0912e751dcf411c57923ec79b72944d Mon Sep 17 00:00:00 2001
From: thedarkone <nobody>
Date: Thu, 5 Mar 2009 18:49:22 -0600
Subject: Fix layouts with absolute paths [#2134 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 actionpack/test/controller/layout_test.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 28555ee3d1..1575674e18 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -79,6 +79,10 @@ end
 class DefaultLayoutController < LayoutTest
 end
 
+class AbsolutePathLayoutController < LayoutTest
+  layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test.rhtml')
+end
+
 class HasOwnLayoutController < LayoutTest
   layout 'item'
 end
@@ -137,12 +141,18 @@ class LayoutSetInResponseTest < ActionController::TestCase
   ensure
     ActionController::Base.exempt_from_layout.delete(/\.rhtml$/)
   end
-  
+
   def test_layout_is_picked_from_the_controller_instances_view_path
     @controller = PrependsViewPathController.new
     get :hello
     assert_equal 'layouts/alt', @response.layout
   end
+
+  def test_absolute_pathed_layout
+    @controller = AbsolutePathLayoutController.new
+    get :hello
+    assert_equal "layout_test.rhtml hello.rhtml", @response.body.strip
+  end
 end
 
 class RenderWithTemplateOptionController < LayoutTest
-- 
cgit v1.2.3