mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Delegate xhr helper method to integration session
This commit is contained in:
@@ -451,7 +451,7 @@ EOF
|
||||
end
|
||||
|
||||
%w(get post put head delete cookies assigns
|
||||
xml_http_request get_via_redirect post_via_redirect).each do |method|
|
||||
xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
|
||||
define_method(method) do |*args|
|
||||
reset! unless @integration_session
|
||||
# reset the html_document variable, but only for new get/post calls
|
||||
|
||||
@@ -253,7 +253,10 @@ class IntegrationProcessTest < ActionController::IntegrationTest
|
||||
session :off
|
||||
|
||||
def get
|
||||
render :text => "OK", :status => 200
|
||||
respond_to do |format|
|
||||
format.html { render :text => "OK", :status => 200 }
|
||||
format.js { render :text => "JS OK", :status => 200 }
|
||||
end
|
||||
end
|
||||
|
||||
def post
|
||||
@@ -345,6 +348,20 @@ class IntegrationProcessTest < ActionController::IntegrationTest
|
||||
end
|
||||
end
|
||||
|
||||
def test_xml_http_request_get
|
||||
with_test_route_set do
|
||||
xhr :get, '/get'
|
||||
assert_equal 200, status
|
||||
assert_equal "OK", status_message
|
||||
assert_equal "200 OK", response.headers["Status"]
|
||||
assert_equal ["200 OK"], headers["status"]
|
||||
assert_response 200
|
||||
assert_response :success
|
||||
assert_response :ok
|
||||
assert_equal "JS OK", response.body
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def with_test_route_set
|
||||
with_routing do |set|
|
||||
|
||||
Reference in New Issue
Block a user