Ticket #8737: layout_broken_with_only.diff

actionpack/test/controller/layout_test.rb

@@ -135 +135 @@
-class DefaultLayoutController < LayoutTest
-end
-
+class UsesMultipleLayoutController < LayoutTest
+  layout 'item', :only => :hello
+  def world
+    render :template => 'hello'
+  end
+end
+
-class HasOwnLayoutController < LayoutTest
-  layout 'item'
-end
@@ -163 +170 @@
-    assert_equal 'layouts/layout_test', @response.layout
-  end
-  
+  def test_layout_set_when_set_with_only
+    @controller = UsesMultipleLayoutController.new
+    get :hello
+    assert_equal 'layouts/item', @response.layout
+  end
+  
+  def test_parent_layout_set_when_only_conditional_layout_used
+    @controller = UsesMultipleLayoutController.new
+    get :world
+    assert_equal 'layouts/layout_test', @response.layout
+  end
+  
-  def test_layout_set_when_set_in_controller
-    @controller = HasOwnLayoutController.new
-    get :hello