aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAngelo capilleri <capilleri@yahoo.com>2012-10-31 14:25:51 +0100
committerAngelo capilleri <capilleri@yahoo.com>2012-10-31 15:07:37 +0100
commita8560fa361958b33d76e4468eb5c07d82a20196e (patch)
treecb8c582ce21a3a58110bd6430cd74a43204e33d4 /actionpack/test
parent65697098811af50a0191a4fce3289b24335f96f9 (diff)
downloadrails-a8560fa361958b33d76e4468eb5c07d82a20196e.tar.gz
rails-a8560fa361958b33d76e4468eb5c07d82a20196e.tar.bz2
rails-a8560fa361958b33d76e4468eb5c07d82a20196e.zip
if format is unknown NullMimeTypeObject is returned
If a unknown format is passed in a request, the methods html?, xml?, json? ...etc Nil Exception. This patch add a class NullMimeTypeObject, that is returned when request.format is unknown and it responds false to the methods that ends with '?'. It refers to #7837, not fixes because it's not considered a improvement not a bug.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/request_test.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index e2964f9071..b3466faffb 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -590,7 +590,17 @@ class RequestTest < ActiveSupport::TestCase
request = stub_request
request.expects(:parameters).at_least_once.returns({ :format => :unknown })
- assert request.formats.empty?
+ assert_instance_of Mime::NullMimeTypeObject , 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.html?, false
+ assert_equal request.format.xml?, false
+ assert_equal request.format.json?, false
+ assert !request.format.html?
end
test "formats with xhr request" do