aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-05 05:41:09 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-05 05:41:09 -0700
commitcb8ac7d377746e39cc512bb0fbfc6a667e91c0cd (patch)
tree3048c24fa7a968d9398b3a7f71e83c09d3ead2f7 /actionpack/lib/action_controller
parent5534733f69d36312b1a4e34dee61b41504a2c9e2 (diff)
parent0303c2325fab253adf5e4a0b738cb469c048f008 (diff)
downloadrails-cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd.tar.gz
rails-cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd.tar.bz2
rails-cb8ac7d377746e39cc512bb0fbfc6a667e91c0cd.zip
Merge pull request #6957 from francois2metz/options_method
Add the options method to action_controller testcase.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_case.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index a1f29ea1bc..555f4de3ac 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -430,8 +430,13 @@ module ActionController
end
# Executes a request simulating HEAD HTTP method and set/volley the response
- def head(action, parameters = nil, session = nil, flash = nil)
- process(action, "HEAD", parameters, session, flash)
+ def head(action, *args)
+ process(action, "HEAD", *args)
+ end
+
+ # Executes a request simulating OPTIONS HTTP method and set/volley the response
+ def options(action, *args)
+ process(action, "OPTIONS", *args)
end
def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)