1 files changed, 59 insertions, 65 deletions

diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 3017a9c2d6..149e37bf3d 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -1,7 +1,6 @@
 require 'abstract_unit'
 
 class MimeTypeTest < ActiveSupport::TestCase
-
   test "parse single" do
     Mime::LOOKUP.each_key do |mime_type|
       unless mime_type == 'image/*'
@@ -11,97 +10,95 @@ class MimeTypeTest < ActiveSupport::TestCase
   end
 
   test "unregister" do
+    assert_nil Mime[:mobile]
+
     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 = Mime::Type.register("text/x-mobile", :mobile)
+      assert_equal mime, Mime[:mobile]
+      assert_equal mime, Mime::Type.lookup('text/x-mobile')
+      assert_equal mime, Mime::Type.lookup_by_extension(: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]"
+      assert_nil Mime[:mobile], "Mime[:mobile] should be nil after unregistering :mobile"
+      assert_nil Mime::Type.lookup_by_extension(:mobile), "Should be missing MIME extension lookup for :mobile"
     ensure
-      Mime.module_eval { remove_const :MOBILE if const_defined?(:MOBILE) }
-      Mime::LOOKUP.reject!{|key,_| key == 'text/x-mobile'}
+      Mime::Type.unregister :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::VCF, Mime::XML, Mime::YAML, Mime::JSON, Mime::MULTIPART_FORM]
+    expect = [Mime[:html], Mime[:text], Mime[:js], Mime[:css], Mime[:ics], Mime[:csv], Mime[:vcf], 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::VCF, Mime::XML, Mime::YAML]
+    expect = [Mime[:html], Mime[:json], Mime[:multipart_form], Mime[:text], Mime[:js], Mime[:css], Mime[:ics], Mime[:csv], Mime[:vcf], 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::VCF, Mime::XML, Mime::YAML, Mime::JSON]
+    expect = [Mime[:html], Mime[:text], Mime[:js], Mime[:css], Mime[:ics], Mime[:csv], Mime[:vcf], 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, Mime::ZIP]
+    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
 
   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]
-    assert_equal expect, Mime::Type.parse(accept)
+    expect = [Mime[:html], Mime[:xml], Mime[:yaml], Mime[:png], Mime[:text], Mime[:pdf], '*/*']
+    assert_equal expect.map(&:to_s), Mime::Type.parse(accept).map(&:to_s)
   end
 
   test "parse with q" do
     accept = "text/xml,application/xhtml+xml,text/yaml; q=0.3,application/xml,text/html; q=0.8,image/png,text/plain; q=0.5,application/pdf,*/*; q=0.2"
-    expect = [Mime::HTML, Mime::XML, Mime::PNG, Mime::PDF, Mime::TEXT, Mime::YAML, Mime::ALL]
-    assert_equal expect, Mime::Type.parse(accept)
+    expect = [Mime[:html], Mime[:xml], Mime[:png], Mime[:pdf], Mime[:text], Mime[:yaml], '*/*']
+    assert_equal expect.map(&:to_s), Mime::Type.parse(accept).map(&:to_s)
   end
 
   test "parse single media range with q" do
     accept = "text/html;q=0.9"
-    expect = [Mime::HTML]
+    expect = [Mime[:html]]
     assert_equal expect, Mime::Type.parse(accept)
   end
 
   test "parse arbitrary media type parameters" do
     accept = 'multipart/form-data; boundary="simple boundary"'
-    expect = [Mime::MULTIPART_FORM]
+    expect = [Mime[:multipart_form]]
     assert_equal expect, Mime::Type.parse(accept)
   end
 
   # Accept header send with user HTTP_USER_AGENT: Sunrise/0.42j (Windows XP)
   test "parse broken acceptlines" do
     accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/*,,*/*;q=0.5"
-    expect = [Mime::HTML, Mime::XML, "image/*", Mime::TEXT, Mime::ALL]
-    assert_equal expect, Mime::Type.parse(accept).collect(&:to_s)
+    expect = [Mime[:html], Mime[:xml], "image/*", Mime[:text], '*/*']
+    assert_equal expect.map(&:to_s), Mime::Type.parse(accept).map(&:to_s)
   end
 
   # Accept header send with user HTTP_USER_AGENT: Mozilla/4.0
   #  (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; InfoPath.1)
   test "parse other broken acceptlines" do
     accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword,  , pronto/1.00.00, sslvpn/1.00.00.00, */*"
-    expect = ['image/gif', 'image/x-xbitmap', 'image/jpeg','image/pjpeg', 'application/x-shockwave-flash', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/msword', 'pronto/1.00.00', 'sslvpn/1.00.00.00', Mime::ALL]
-    assert_equal expect, Mime::Type.parse(accept).collect(&:to_s)
+    expect = ['image/gif', 'image/x-xbitmap', 'image/jpeg','image/pjpeg', 'application/x-shockwave-flash', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/msword', 'pronto/1.00.00', 'sslvpn/1.00.00.00', '*/*']
+    assert_equal expect.map(&:to_s), Mime::Type.parse(accept).map(&:to_s)
   end
 
   test "custom type" do
     begin
-      Mime::Type.register("image/foo", :foo)
-      assert_nothing_raised do
-        assert_equal Mime::FOO, Mime::SET.last
-      end
+      type = Mime::Type.register("image/foo", :foo)
+      assert_equal type, Mime[:foo]
     ensure
-      Mime::Type.unregister(:FOO)
+      Mime::Type.unregister(:foo)
     end
   end
 
@@ -109,10 +106,10 @@ class MimeTypeTest < ActiveSupport::TestCase
     begin
       Mime::Type.register "text/foobar", :foobar, ["text/foo", "text/bar"]
       %w[text/foobar text/foo text/bar].each do |type|
-        assert_equal Mime::FOOBAR, type
+        assert_equal Mime[:foobar], type
       end
     ensure
-      Mime::Type.unregister(:FOOBAR)
+      Mime::Type.unregister(:foobar)
     end
   end
 
@@ -123,10 +120,10 @@ class MimeTypeTest < ActiveSupport::TestCase
         registered_mimes << mime
       end
 
-      Mime::Type.register("text/foo", :foo)
-      assert_equal [Mime::FOO], registered_mimes
+      mime = Mime::Type.register("text/foo", :foo)
+      assert_equal [mime], registered_mimes
     ensure
-      Mime::Type.unregister(:FOO)
+      Mime::Type.unregister(:foo)
     end
   end
 
@@ -134,70 +131,67 @@ class MimeTypeTest < ActiveSupport::TestCase
     begin
       Mime::Type.register "text/foobar", :foobar, [], [:foo, "bar"]
       %w[foobar foo bar].each do |extension|
-        assert_equal Mime::FOOBAR, Mime::EXTENSION_LOOKUP[extension]
+        assert_equal Mime[:foobar], Mime::EXTENSION_LOOKUP[extension]
       end
     ensure
-      Mime::Type.unregister(:FOOBAR)
+      Mime::Type.unregister(:foobar)
     end
   end
 
   test "register alias" do
     begin
       Mime::Type.register_alias "application/xhtml+xml", :foobar
-      assert_equal Mime::HTML, Mime::EXTENSION_LOOKUP['foobar']
+      assert_equal Mime[:html], Mime::EXTENSION_LOOKUP['foobar']
     ensure
-      Mime::Type.unregister(:FOOBAR)
+      Mime::Type.unregister(:foobar)
     end
   end
 
   test "type should be equal to symbol" do
-    assert_equal Mime::HTML, 'application/xhtml+xml'
-    assert_equal Mime::HTML, :html
+    assert_equal Mime[:html], 'application/xhtml+xml'
+    assert_equal Mime[:html], :html
   end
 
   test "type convenience methods" do
-    # Don't test Mime::ALL, since it Mime::ALL#html? == true
-    types = Mime::SET.symbols.uniq - [:all, :iphone]
-
-    # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
-    types.delete_if { |type| !Mime.const_defined?(type.upcase) }
-
+    types = Mime::SET.symbols.uniq - [:iphone]
 
     types.each do |type|
-      mime = Mime.const_get(type.upcase)
+      mime = Mime[type]
       assert mime.respond_to?("#{type}?"), "#{mime.inspect} does not respond to #{type}?"
-      assert mime.send("#{type}?"), "#{mime.inspect} is not #{type}?"
+      assert_equal type, mime.symbol, "#{mime.inspect} is not #{type}?"
       invalid_types = types - [type]
-      invalid_types.delete(:html) if Mime::Type.html_types.include?(type)
-      invalid_types.each { |other_type| assert !mime.send("#{other_type}?"), "#{mime.inspect} is #{other_type}?" }
+      invalid_types.delete(:html)
+      invalid_types.each { |other_type|
+        assert_not_equal mime.symbol, other_type, "#{mime.inspect} is #{other_type}?"
+      }
     end
   end
 
-  test "mime all is html" do
-    assert Mime::ALL.all?,  "Mime::ALL is not all?"
-    assert Mime::ALL.html?, "Mime::ALL is not html?"
+  test "deprecated lookup" do
+    assert_deprecated do
+      Mime::HTML
+    end
   end
 
-  test "verifiable mime types" do
-    all_types = Mime::SET.symbols
-    all_types.uniq!
-    # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
-    all_types.delete_if { |type| !Mime.const_defined?(type.upcase) }
+  test "deprecated const_defined?" do
+    assert_deprecated do
+      Mime.const_defined? :HTML
+    end
   end
 
   test "references gives preference to symbols before strings" do
-    assert_equal :html, Mime::HTML.ref
+    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"
-    assert Mime::JS !~ "text/html"
-    assert !(Mime::JS !~ "text/javascript")
-    assert !(Mime::JS !~ "application/javascript")
-    assert Mime::HTML =~ 'application/xhtml+xml'
+    assert Mime[:js] =~ "text/javascript"
+    assert Mime[:js] =~ "application/javascript"
+    assert Mime[:js] !~ "text/html"
+    assert !(Mime[:js] !~ "text/javascript")
+    assert !(Mime[:js] !~ "application/javascript")
+    assert Mime[:html] =~ 'application/xhtml+xml'
   end
 end