diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-09 22:51:03 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-09 22:51:03 -0800 |
| commit | a9056263f6d3419536419d095ff146b5b994941e (patch) | |
| tree | b3c0cf7318835ace650dba360cc6e09c009e6bd6 /actionpack/lib/action_controller | |
| parent | 2babe0ac45e29ba56a36dd9e6e70431993546f46 (diff) | |
| parent | 3f38d8442e2c365c6625c647d77f7b31f4da0cd1 (diff) | |
| download | rails-a9056263f6d3419536419d095ff146b5b994941e.tar.gz rails-a9056263f6d3419536419d095ff146b5b994941e.tar.bz2 rails-a9056263f6d3419536419d095ff146b5b994941e.zip | |
Merge pull request #4395 from rafaelfranca/fix_ac_test_case
Fix ActionController::TestCase::Behavior#head
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index d09d3d844b..e9cdb7fbef 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) @@ -433,7 +433,7 @@ module ActionController check_required_ivars http_method, args = handle_old_process_api(http_method, args) - if args.first.is_a?(String) + if args.first.is_a?(String) && http_method != 'HEAD' @request.env['RAW_POST_DATA'] = args.shift end |