aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-10 01:47:07 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-10 02:00:20 -0300
commit30f9af9c092c57c7aca187a9f8c87d58661e8fa8 (patch)
treedf8b494cacd89981d6af88c0674b0c9cd902fe28
parent2babe0ac45e29ba56a36dd9e6e70431993546f46 (diff)
downloadrails-30f9af9c092c57c7aca187a9f8c87d58661e8fa8.tar.gz
rails-30f9af9c092c57c7aca187a9f8c87d58661e8fa8.tar.bz2
rails-30f9af9c092c57c7aca187a9f8c87d58661e8fa8.zip
Fix ActionController::TestCase::Behavior.head
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
-rw-r--r--actionpack/test/controller/test_case_test.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index d09d3d844b..62770813bd 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -403,7 +403,7 @@ module ActionController
# Executes a request simulating HEAD HTTP method and set/volley the response
def head(action, parameters = nil, session = nil, flash = nil)
- process(action, parameters, session, flash, "HEAD")
+ process(action, "HEAD", parameters, session, flash)
end
def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 73b860ac18..88c45683a3 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -187,6 +187,11 @@ XML
assert_equal "document body", @response.body
end
+ def test_head
+ head :test_params
+ assert_equal 200, @response.status
+ end
+
def test_process_without_flash
process :set_flash
assert_equal '><', flash['test']