diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-16 14:39:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-16 14:41:36 -0300 |
| commit | c9d75e0814a3fa5797c58e3d98f76fa2990c5b5f (patch) | |
| tree | 41a1622401060f4d817c363b4b806b2aa110bde3 /actionpack/lib/action_dispatch | |
| parent | 4eb16e7a0627a5d6ca043cecac77b3b934747fcb (diff) | |
| download | rails-c9d75e0814a3fa5797c58e3d98f76fa2990c5b5f.tar.gz rails-c9d75e0814a3fa5797c58e3d98f76fa2990c5b5f.tar.bz2 rails-c9d75e0814a3fa5797c58e3d98f76fa2990c5b5f.zip | |
Revert "Integration tests support the OPTIONS http method"
This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba.
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_dispatch/testing/integration.rb
actionpack/test/controller/integration_test.rb
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.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 56c31255f3..70b42ccd1b 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -62,12 +62,6 @@ module ActionDispatch process :head, path, parameters, headers_or_env end - # Performs a OPTIONS request with the given parameters. See +#get+ for - # more details. - def options(path, parameters = nil, headers_or_env = nil) - process :options, path, parameters, headers_or_env - end - # Performs an XMLHttpRequest request with the given parameters, mirroring # a request from the Prototype library. # @@ -342,7 +336,7 @@ module ActionDispatch @integration_session = Integration::Session.new(app) end - %w(get post patch put head delete options cookies assigns + %w(get post patch put head delete cookies assigns xml_http_request xhr get_via_redirect post_via_redirect).each do |method| define_method(method) do |*args| reset! unless integration_session |