aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorAngelo Capilleri <capilleri@yahoo.com>2012-12-22 09:18:01 +0100
committerAngelo Capilleri <capilleri@yahoo.com>2012-12-22 09:18:08 +0100
commitc2267db383fb42e2e3c2abdbd58be6638908fb0f (patch)
treea8d5e887c6aec323bd45c21f05316022dcf48ed6 /actionpack/test/dispatch
parentf9da785d0b1b22317cfca25c15fb555e9016accb (diff)
downloadrails-c2267db383fb42e2e3c2abdbd58be6638908fb0f.tar.gz
rails-c2267db383fb42e2e3c2abdbd58be6638908fb0f.tar.bz2
rails-c2267db383fb42e2e3c2abdbd58be6638908fb0f.zip
return Mime::NullType if format is unknown
If a request has an unknown format, the methods html?, xml?, json? ...etc not raise an Exception. This patch add a class Mime::NullType, that is returned when request.format is unknown and it responds false to the methods that ends with '?' and true to 'nil?'. It refers to #7837, this issue is considered a improvement not a bug.
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/request_test.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 263853fb6c..4e59e214c6 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -591,9 +591,18 @@ class RequestTest < ActiveSupport::TestCase
request = stub_request
request.expects(:parameters).at_least_once.returns({ :format => :unknown })
- assert request.formats.empty?
+ assert_instance_of Mime::NullType, request.format
end
+ test "format is not nil with unknown format" do
+ request = stub_request
+ request.expects(:parameters).at_least_once.returns({ format: :hello })
+ assert_equal request.format.nil?, true
+ assert_equal request.format.html?, false
+ assert_equal request.format.xml?, false
+ assert_equal request.format.json?, false
+ end
+
test "formats with xhr request" do
request = stub_request 'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
request.expects(:parameters).at_least_once.returns({})