Ticket #9476: layout_with_status.2.diff

test/controller/layout_test.rb

@@ -200 +200 @@
-    assert_equal ActionController::MissingTemplate, @response.template.exception.class
-  end
-end
+
+class LayoutStatusIsRendered < LayoutTest
+  def hello
+    render :status => 401
+  end
+end
+
+class LayoutStatusIsRenderedTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_layout_status_is_rendered
+    @controller = LayoutStatusIsRendered.new
+    get :hello
+    assert_response 401
+  end
+end

lib/action_controller/layout.rb

@@ -247 +247 @@
-          add_variables_to_assigns
-          @template.instance_variable_set("@content_for_layout", content_for_layout)
-          response.layout = layout
-
+
+
-        else
-          render_with_no_layout(options, &block)
-        end