diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-06-27 10:21:26 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-06-27 10:21:26 -0700 |
| commit | 90f00142e6ff6a674f89c51a6784309b24b246bf (patch) | |
| tree | 106c7a419213529bd941993e825ea072aaa63f97 | |
| parent | 463c08d1c2131fada69d8aefde79c5928e9015d2 (diff) | |
| parent | db0499a6b6c23d03c7b03948e569902526c86acd (diff) | |
| download | rails-90f00142e6ff6a674f89c51a6784309b24b246bf.tar.gz rails-90f00142e6ff6a674f89c51a6784309b24b246bf.tar.bz2 rails-90f00142e6ff6a674f89c51a6784309b24b246bf.zip | |
Merge pull request #11146 from kennyj/re-remove-deprecated-api
Re-remove deprecated API.
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 12 | ||||
| -rw-r--r-- | actionpack/test/controller/test_case_test.rb | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 0cbbbbe1fd..5ed3d2ebc1 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -524,7 +524,6 @@ module ActionController def process(action, http_method = 'GET', *args) check_required_ivars - http_method, args = handle_old_process_api(http_method, args, caller) if args.first.is_a?(String) && http_method != 'HEAD' @request.env['RAW_POST_DATA'] = args.shift @@ -628,17 +627,6 @@ module ActionController end end - def handle_old_process_api(http_method, args, callstack) - # 4.0: Remove this method. - if http_method.is_a?(Hash) - ActiveSupport::Deprecation.warn("TestCase#process now expects the HTTP method as second argument: process(action, http_method, params, session, flash)", callstack) - args.unshift(http_method) - http_method = args.last.is_a?(String) ? args.last : "GET" - end - - [http_method, args] - end - def build_request_uri(action, parameters) unless @request.env["PATH_INFO"] options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb index 7c27458f46..f75c604277 100644 --- a/actionpack/test/controller/test_case_test.rb +++ b/actionpack/test/controller/test_case_test.rb @@ -280,13 +280,6 @@ XML assert_equal "/test_case_test/test/test_uri/7", @response.body end - def test_process_with_old_api - assert_deprecated do - process :test_uri, :id => 7 - assert_equal "/test_case_test/test/test_uri/7", @response.body - end - end - def test_process_with_request_uri_with_params_with_explicit_uri @request.env['PATH_INFO'] = "/explicit/uri" process :test_uri, "GET", :id => 7 |