diff options
author | wycats <wycats@gmail.com> | 2010-03-28 13:40:38 -0700 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-03-28 13:40:38 -0700 |
commit | 77a2a3d9b3aa461437ced326ea4a70112a8c68ed (patch) | |
tree | eb236e6832815f95629d4b00a475e19dc2e575aa /actionpack/test/dispatch/rack_test.rb | |
parent | e1a70faea675499d717cef7662262ceb03b23975 (diff) | |
download | rails-77a2a3d9b3aa461437ced326ea4a70112a8c68ed.tar.gz rails-77a2a3d9b3aa461437ced326ea4a70112a8c68ed.tar.bz2 rails-77a2a3d9b3aa461437ced326ea4a70112a8c68ed.zip |
Request#content_type exists in Rack::Request, and other parts of Rack::Request expect
it to return a String. Split the Rails API so that Request#content_type returns
a String, and Request#content_mime_type returns a Mime::Type object.
Diffstat (limited to 'actionpack/test/dispatch/rack_test.rb')
-rw-r--r-- | actionpack/test/dispatch/rack_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb index 94eba2a24f..504bebbb86 100644 --- a/actionpack/test/dispatch/rack_test.rb +++ b/actionpack/test/dispatch/rack_test.rb @@ -122,7 +122,7 @@ class RackRequestTest < BaseRackTest test "cgi environment variables" do assert_equal "Basic", @request.auth_type assert_equal 0, @request.content_length - assert_equal nil, @request.content_type + assert_equal nil, @request.content_mime_type assert_equal "CGI/1.1", @request.gateway_interface assert_equal "*/*", @request.accept assert_equal "UTF-8", @request.accept_charset @@ -177,12 +177,12 @@ end class RackRequestContentTypeTest < BaseRackTest test "html content type verification" do @request.env['CONTENT_TYPE'] = Mime::HTML.to_s - assert @request.content_type.verify_request? + assert @request.content_mime_type.verify_request? end test "xml content type verification" do @request.env['CONTENT_TYPE'] = Mime::XML.to_s - assert !@request.content_type.verify_request? + assert !@request.content_mime_type.verify_request? end end |