Remove deprecated xml_http_request
and xhr
methods
This commit is contained in:
parent
7093ceb480
commit
31639eab59
@ -1,3 +1,7 @@
|
||||
* Remove deprecated `xml_http_request` and `xhr` methods in `ActionController::TestCase`.
|
||||
|
||||
*Rafael Mendonça França*
|
||||
|
||||
* Remove deprecated methods in `ActionController::Parameters`.
|
||||
|
||||
*Rafael Mendonça França*
|
||||
|
@ -422,21 +422,6 @@ def head(action, *args)
|
||||
process_with_kwargs("HEAD", action, *args)
|
||||
end
|
||||
|
||||
def xml_http_request(*args)
|
||||
ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
|
||||
xhr and xml_http_request methods are deprecated in favor of
|
||||
`get :index, xhr: true` and `post :create, xhr: true`
|
||||
MSG
|
||||
|
||||
@request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
|
||||
@request.env["HTTP_ACCEPT"] ||= [Mime[:js], Mime[:html], Mime[:xml], "text/xml", "*/*"].join(", ")
|
||||
__send__(*args).tap do
|
||||
@request.env.delete "HTTP_X_REQUESTED_WITH"
|
||||
@request.env.delete "HTTP_ACCEPT"
|
||||
end
|
||||
end
|
||||
alias xhr :xml_http_request
|
||||
|
||||
# Simulate an HTTP request to +action+ by specifying request method,
|
||||
# parameters and set/volley the response.
|
||||
#
|
||||
|
@ -742,12 +742,6 @@ def test_header_properly_reset_after_remote_http_request
|
||||
assert_nil @request.env["HTTP_ACCEPT"]
|
||||
end
|
||||
|
||||
def test_deprecated_xhr_with_params
|
||||
assert_deprecated { xhr :get, :test_params, params: { id: 1 } }
|
||||
|
||||
assert_equal({ "id"=>"1", "controller"=>"test_case_test/test", "action"=>"test_params" }, ::JSON.parse(@response.body))
|
||||
end
|
||||
|
||||
def test_xhr_with_params
|
||||
get :test_params, params: { id: 1 }, xhr: true
|
||||
|
||||
@ -763,15 +757,6 @@ def test_xhr_with_session
|
||||
assert_equal "it works", session[:symbol], "Test session hash should allow indifferent access"
|
||||
end
|
||||
|
||||
def test_deprecated_xhr_with_session
|
||||
assert_deprecated { xhr :get, :set_session }
|
||||
|
||||
assert_equal "A wonder", session["string"], "A value stored in the session should be available by string key"
|
||||
assert_equal "A wonder", session[:string], "Test session hash should allow indifferent access"
|
||||
assert_equal "it works", session["symbol"], "Test session hash should allow indifferent access"
|
||||
assert_equal "it works", session[:symbol], "Test session hash should allow indifferent access"
|
||||
end
|
||||
|
||||
def test_deprecated_params_reset_between_post_requests
|
||||
assert_deprecated { post :no_op, foo: "bar" }
|
||||
assert_equal "bar", @request.params[:foo]
|
||||
|
Loading…
Reference in New Issue
Block a user