aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-28 04:58:29 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-28 04:58:29 -0700
commit0a873627e4133be35e011026cee3fe26261ef224 (patch)
treefba2b31e3040833ed5b6d2e6646fe6b2a50bd9a3 /actionpack/test
parent76581d0f1bcb54c5d7505ae05de150a086dfbd37 (diff)
parent1b957177e777085082c46e620a9b96b49aebb5fd (diff)
downloadrails-0a873627e4133be35e011026cee3fe26261ef224.tar.gz
rails-0a873627e4133be35e011026cee3fe26261ef224.tar.bz2
rails-0a873627e4133be35e011026cee3fe26261ef224.zip
Merge pull request #1877 from arunagw/fix_mime
Fix test to use Mime::Zip
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/mime_type_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 11cf68fdb3..3d958eee2c 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -52,7 +52,7 @@ class MimeTypeTest < ActiveSupport::TestCase
test "parse application with trailing star" do
accept = "application/*"
- expect = [Mime::HTML, Mime::JS, Mime::XML, Mime::RSS, Mime::ATOM, Mime::YAML, Mime::URL_ENCODED_FORM, Mime::JSON, Mime::PDF]
+ expect = [Mime::HTML, Mime::JS, Mime::XML, Mime::RSS, Mime::ATOM, Mime::YAML, Mime::URL_ENCODED_FORM, Mime::JSON, Mime::PDF, Mime::ZIP]
parsed = Mime::Type.parse(accept)
assert_equal expect, parsed
end