mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
remove deprecated API
This commit is contained in:
parent
4fa10300ef
commit
f53c247d10
3 changed files with 1 additions and 20 deletions
|
@ -431,7 +431,6 @@ module ActionController
|
|||
|
||||
def process(action, http_method = 'GET', *args)
|
||||
check_required_ivars
|
||||
http_method, args = handle_old_process_api(http_method, args)
|
||||
|
||||
if args.first.is_a?(String)
|
||||
@request.env['RAW_POST_DATA'] = args.shift
|
||||
|
@ -513,17 +512,6 @@ module ActionController
|
|||
end
|
||||
end
|
||||
|
||||
def handle_old_process_api(http_method, args)
|
||||
# 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)")
|
||||
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
|
||||
|
|
|
@ -338,7 +338,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
def test_render_based_on_parameters
|
||||
process :render_based_on_parameters, "name" => "David"
|
||||
process :render_based_on_parameters, 'GET', "name" => "David"
|
||||
assert_equal "Mr. David", @response.body
|
||||
end
|
||||
|
||||
|
|
|
@ -246,13 +246,6 @@ XML
|
|||
assert_equal "/test_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_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
|
||||
|
|
Loading…
Reference in a new issue