Skip to content


Browse files Browse the repository at this point in the history
Revert "Add the options method to action_controller testcase."
This reverts commit 0303c23.


REASON: It will conflict with a lot of test cases. Better to call
`process` directly since this is a very uncommon HTTP method.

Fixes #10638.
  • Loading branch information
rafaelfranca committed May 16, 2013
1 parent 89f558c commit 6a4ff5c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
6 changes: 0 additions & 6 deletions actionpack/lib/action_controller/test_case.rb
Expand Up @@ -499,12 +499,6 @@ def head(action, *args)
process(action, "HEAD", *args)

# Simulate a OPTIONS request with the given parameters and set/volley the response.
# See +get+ for more details.
def options(action, *args)
process(action, "OPTIONS", *args)

def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
@request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
@request.env['HTTP_ACCEPT'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
Expand Down
5 changes: 0 additions & 5 deletions actionpack/test/controller/test_case_test.rb
Expand Up @@ -201,11 +201,6 @@ def test_head_params_as_sting
assert_raise(NoMethodError) { head :test_params, "document body", :id => 10 }

def test_options
options :test_params
assert_equal 200, @response.status

def test_process_without_flash
process :set_flash
assert_equal '><', flash['test']
Expand Down

0 comments on commit 6a4ff5c

Please sign in to comment.