1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index edf8f44b3a..5689ed0711 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -28,6 +28,9 @@ end
 class ControllerNameSpace::NestedController < LayoutTest
 end
 
+class MultipleExtensions < LayoutTest
+end
+
 class MabView
   def initialize(view)
   end
@@ -72,6 +75,13 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
     assert_equal 'layouts/controller_name_space/nested', @controller.active_layout
     assert_equal 'controller_name_space/nested.rhtml hello.rhtml', @response.body
   end
+  
+  def test_namespaced_controllers_auto_detect_layouts
+    @controller = MultipleExtensions.new
+    get :hello
+    assert_equal 'layouts/multiple_extensions', @controller.active_layout
+    assert_equal 'multiple_extensions.html.erb hello.rhtml', @response.body.strip
+  end
 end
 
 class ExemptFromLayoutTest < Test::Unit::TestCase