Fix test to use Mime::Zip

rails · Jun 28, 2011 · 1b95717 · 1b95717
1 parent 76581d0
commit 1b95717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb
@@ -21,15 +21,15 @@
 Mime::Type.register "application/atom+xml", :atom
 Mime::Type.register "application/x-yaml", :yaml, %w( text/yaml )
 
-Mime::Type.register "application/pdf", :pdf, [], %w(pdf)
-Mime::Type.register "application/zip", :zip, [], %w(zip)
-
 Mime::Type.register "multipart/form-data", :multipart_form
 Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form
 
 # http://www.ietf.org/rfc/rfc4627.txt
 # http://www.json.org/JSONRequest.html
 Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
 
+Mime::Type.register "application/pdf", :pdf, [], %w(pdf)
+Mime::Type.register "application/zip", :zip, [], %w(zip)
+
 # Create Mime::ALL but do not add it to the SET.
 Mime::ALL = Mime::Type.new("*/*", :all, [])
diff --git 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