diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-10-31 10:01:39 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-10-31 10:01:39 -0500 |
| commit | 4b20cd9c663a417353e4d0388189af71cc642fca (patch) | |
| tree | 3ccb842f538cca13fcd24661e68b68a6728101f0 /actionpack/test/dispatch/request_test.rb | |
| parent | 9fdf606954a61658b166b48d795313c33957b2c1 (diff) | |
| download | rails-4b20cd9c663a417353e4d0388189af71cc642fca.tar.gz rails-4b20cd9c663a417353e4d0388189af71cc642fca.tar.bz2 rails-4b20cd9c663a417353e4d0388189af71cc642fca.zip | |
Revert "if format is unknown NullMimeTypeObject is returned"
This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e.
Diffstat (limited to 'actionpack/test/dispatch/request_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index b3466faffb..e2964f9071 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -590,17 +590,7 @@ class RequestTest < ActiveSupport::TestCase request = stub_request request.expects(:parameters).at_least_once.returns({ :format => :unknown }) - 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? + assert request.formats.empty? end test "formats with xhr request" do |