aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-12-31 16:52:27 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-12-31 16:52:27 -0200
commit777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680 (patch)
tree9e84973c1bbd55ec44aeb8a56d5bdbc2459acc53 /actionpack/test
parentae08bef428827e8da4b00088b273de11b5190aed (diff)
parent7ef7f1cc152a4b180dd455ffa859bf11d1daeda0 (diff)
downloadrails-777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680.tar.gz
rails-777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680.tar.bz2
rails-777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680.zip
Merge pull request #18275 from robin850/head-status
Correctly use the response's status code calling head
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/render_test.rb17
1 files changed, 17 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index b036b6c08e..929b161eb6 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -217,6 +217,15 @@ class TestController < ActionController::Base
head :forbidden, :x_custom_header => "something"
end
+ def head_with_no_content
+ # Fill in the headers with dummy data to make
+ # sure they get removed during the testing
+ response.headers["Content-Type"] = "dummy"
+ response.headers["Content-Length"] = 42
+
+ head 204
+ end
+
private
def set_variable_for_layout
@@ -545,6 +554,14 @@ class HeadRenderTest < ActionController::TestCase
end
end
+ def test_head_with_no_content
+ get :head_with_no_content
+
+ assert_equal 204, @response.status
+ assert_nil @response.headers["Content-Type"]
+ assert_nil @response.headers["Content-Length"]
+ end
+
def test_head_with_string_status
get :head_with_string_status, :status => "404 Eat Dirt"
assert_equal 404, @response.response_code