aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/request_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-21 07:02:30 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-21 07:02:30 +0000
commit1e0d9a642ffe5db23086301d3eeed63f4b7bca68 (patch)
tree7eb7cfa3b2f3d9fa7c41666007e30eea86fbed22 /actionpack/test/controller/request_test.rb
parent6c8d354b8d9ca2fa62d0e062fa6346673dd15dbf (diff)
downloadrails-1e0d9a642ffe5db23086301d3eeed63f4b7bca68.tar.gz
rails-1e0d9a642ffe5db23086301d3eeed63f4b7bca68.tar.bz2
rails-1e0d9a642ffe5db23086301d3eeed63f4b7bca68.zip
Added :xhr => true/false option to verify so you can ensure that a request is coming from an Ajax call or not #1464 [Thomas Fuchs]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1463 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/request_test.rb')
-rw-r--r--actionpack/test/controller/request_test.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index dd7c9f9d84..8980ac7520 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -210,4 +210,18 @@ class RequestTest < Test::Unit::TestCase
@request.env['SERVER_SOFTWARE'] = 'lighttpd(1.1.4)'
assert_equal 'lighttpd', @request.server_software
end
+
+ def test_xml_http_request
+ assert !@request.xml_http_request?
+ assert !@request.xhr?
+
+ @request.env['HTTP_X_REQUESTED_WITH'] = "DefinitelyNotAjax1.0"
+ assert !@request.xml_http_request?
+ assert !@request.xhr?
+
+ @request.env['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
+ assert @request.xml_http_request?
+ assert @request.xhr?
+ end
+
end