Ticket #8867: test_multiple_layout_with_only_and_except_conditions.diff

test/controller/layout_test.rb

@@ -151 +151 @@
-  end
-end
-
+class MultipleLayoutController < LayoutTest
+  layout 'layout_test', :only => [:hello]
+  layout 'item', :except => [:hello]
+
+  def hello
+  end
+end
+
-class LayoutSetInResponseTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
@@ -180 +188 @@
-    get :hello
-    assert_nil @response.layout
-  end
+
+  def test_layout_with_except_condition_and_parent_with_only_condition
+    @controller = MultipleLayoutController.new
+    get :hello
+    assert_not_equal 'layouts/item', @response.layout
+  end
-end
-
-