1 files changed, 56 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 369212e2d0..11cf68fdb3 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -6,10 +6,57 @@ class MimeTypeTest < ActiveSupport::TestCase
 
   test "parse single" do
     Mime::LOOKUP.keys.each do |mime_type|
-      assert_equal [Mime::Type.lookup(mime_type)], Mime::Type.parse(mime_type)
+      unless mime_type == 'image/*'
+        assert_equal [Mime::Type.lookup(mime_type)], Mime::Type.parse(mime_type)
+      end
     end
   end
 
+  test "unregister" do
+    begin
+      Mime::Type.register("text/x-mobile", :mobile)
+      assert defined?(Mime::MOBILE)
+      assert_equal Mime::MOBILE, Mime::LOOKUP['text/x-mobile']
+      assert_equal Mime::MOBILE, Mime::EXTENSION_LOOKUP['mobile']
+
+      Mime::Type.unregister(:mobile)
+      assert !defined?(Mime::MOBILE), "Mime::MOBILE should not be defined"
+      assert !Mime::LOOKUP.has_key?('text/x-mobile'), "Mime::LOOKUP should not have key ['text/x-mobile]"
+      assert !Mime::EXTENSION_LOOKUP.has_key?('mobile'), "Mime::EXTENSION_LOOKUP should not have key ['mobile]"
+    ensure
+      Mime.module_eval { remove_const :MOBILE if const_defined?(:MOBILE) }
+      Mime::LOOKUP.reject!{|key,_| key == 'text/x-mobile'}
+    end
+  end
+
+  test "parse text with trailing star at the beginning" do
+    accept = "text/*, text/html, application/json, multipart/form-data"
+    expect = [Mime::HTML, Mime::TEXT, Mime::JS, Mime::CSS, Mime::ICS, Mime::CSV, Mime::XML, Mime::YAML, Mime::JSON, Mime::MULTIPART_FORM]
+    parsed = Mime::Type.parse(accept)
+    assert_equal expect, parsed
+  end
+
+  test "parse text with trailing star in the end" do
+    accept = "text/html, application/json, multipart/form-data, text/*"
+    expect = [Mime::HTML, Mime::JSON, Mime::MULTIPART_FORM, Mime::TEXT, Mime::JS, Mime::CSS, Mime::ICS, Mime::CSV, Mime::XML, Mime::YAML]
+    parsed = Mime::Type.parse(accept)
+    assert_equal expect, parsed
+  end
+
+  test "parse text with trailing star" do
+    accept = "text/*"
+    expect = [Mime::HTML, Mime::TEXT, Mime::JS, Mime::CSS, Mime::ICS, Mime::CSV, Mime::XML, Mime::YAML, Mime::JSON]
+    parsed = Mime::Type.parse(accept)
+    assert_equal expect, parsed
+  end
+
+  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]
+    parsed = Mime::Type.parse(accept)
+    assert_equal expect, parsed
+  end
+
   test "parse without q" do
     accept = "text/xml,application/xhtml+xml,text/yaml,application/xml,text/html,image/png,text/plain,application/pdf,*/*"
     expect = [Mime::HTML, Mime::XML, Mime::YAML, Mime::PNG, Mime::TEXT, Mime::PDF, Mime::ALL]
@@ -41,11 +88,10 @@ class MimeTypeTest < ActiveSupport::TestCase
     begin
       Mime::Type.register("image/gif", :gif)
       assert_nothing_raised do
-        Mime::GIF
         assert_equal Mime::GIF, Mime::SET.last
       end
     ensure
-      Mime.module_eval { remove_const :GIF if const_defined?(:GIF) }
+      Mime::Type.unregister(:gif)
     end
   end
 
@@ -85,6 +131,13 @@ class MimeTypeTest < ActiveSupport::TestCase
     assert unverified.each { |type| assert !Mime.const_get(type.to_s.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
   end
 
+  test "references gives preference to symbols before strings" do
+    assert_equal :html, Mime::HTML.ref
+    another = Mime::Type.lookup("foo/bar")
+    assert_nil another.to_sym
+    assert_equal "foo/bar", another.ref
+  end
+
   test "regexp matcher" do
     assert Mime::JS =~ "text/javascript"
     assert Mime::JS =~ "application/javascript"