aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/request_test.rb12
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