Changeset 7418

Timestamp:

09/08/07 03:12:03 (1 year ago)

Author:

bitsweat

Message:

Fix layout overriding response status. Closes #9476.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
• trunk/actionpack/test/controller/layout_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix layout overriding response status.  #9476 [lotswholetime]
-
-* Add fieldset_tag for generating fieldsets, closes #9477. [djanowski]

trunk/actionpack/lib/action_controller/layout.rb

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

trunk/actionpack/test/controller/layout_test.rb

@@ -201 +201 @@
-  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