kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

remove deprecated API

Browse source
This commit is contained in:
Aaron Patterson 2012-01-05 14:46:34 -08:00
parent 4fa10300ef
commit f53c247d10
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
actionpack/lib/action_controller/test_case.rb
View file

@ -431,7 +431,6 @@ module ActionController
def process(action, http_method = 'GET', *args) def process(action, http_method = 'GET', *args)
check_required_ivars check_required_ivars
http_method, args = handle_old_process_api(http_method, args)
if args.first.is_a?(String) if args.first.is_a?(String)
@request.env['RAW_POST_DATA'] = args.shift @request.env['RAW_POST_DATA'] = args.shift
@ -513,17 +512,6 @@ module ActionController
end end
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) def build_request_uri(action, parameters)
unless @request.env["PATH_INFO"] unless @request.env["PATH_INFO"]
options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters

2
actionpack/test/controller/action_pack_assertions_test.rb
View file

@ -338,7 +338,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
end end
def test_render_based_on_parameters 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 assert_equal "Mr. David", @response.body
end end

7
actionpack/test/controller/test_case_test.rb
View file

@ -245,13 +245,6 @@ XML
process :test_uri, "GET", :id => 7 process :test_uri, "GET", :id => 7
assert_equal "/test_test/test/test_uri/7", @response.body assert_equal "/test_test/test/test_uri/7", @response.body
end 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 def test_process_with_request_uri_with_params_with_explicit_uri
@request.env['PATH_INFO'] = "/explicit/uri" @request.env['PATH_INFO'] = "/explicit/uri"