stop calling deprecated methods

We should be asking the mime type method for the mime objects rather
than via const lookup

7 files changed, 31 insertions, 31 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index beeafc2e53..7dfeadceb0 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -65,7 +65,7 @@ class ActionPackAssertionsController < ActionController::Base
   end
 
   def render_text_with_custom_content_type
-    render body: "Hello!", content_type: Mime::RSS
+    render body: "Hello!", content_type: Mime::Type[:RSS]
   end
 
   def session_stuffing
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index c5bbc479c9..4a86f1bad3 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 class OldContentTypeController < ActionController::Base
   # :ported:
   def render_content_type_from_body
-    response.content_type = Mime::RSS
+    response.content_type = Mime::Type[:RSS]
     render body: "hello world!"
   end
 
@@ -14,7 +14,7 @@ class OldContentTypeController < ActionController::Base
 
   # :ported:
   def render_content_type_from_render
-    render body: "hello world!", :content_type => Mime::RSS
+    render body: "hello world!", :content_type => Mime::Type[:RSS]
   end
 
   # :ported:
@@ -36,7 +36,7 @@ class OldContentTypeController < ActionController::Base
   end
 
   def render_change_for_builder
-    response.content_type = Mime::HTML
+    response.content_type = Mime::Type[:HTML]
     render :action => "render_default_for_builder"
   end
 
@@ -45,7 +45,7 @@ class OldContentTypeController < ActionController::Base
       format.html { render body: "hello world!" }
       format.xml  { render action: "render_default_content_types_for_respond_to" }
       format.js   { render body: "hello world!" }
-      format.rss  { render body: "hello world!", content_type: Mime::XML }
+      format.rss  { render body: "hello world!", content_type: Mime::Type[:XML] }
     end
   end
 end
@@ -64,68 +64,68 @@ class ContentTypeTest < ActionController::TestCase
   def test_render_defaults
     get :render_defaults
     assert_equal "utf-8", @response.charset
-    assert_equal Mime::TEXT, @response.content_type
+    assert_equal Mime::Type[:TEXT], @response.content_type
   end
 
   def test_render_changed_charset_default
     with_default_charset "utf-16" do
       get :render_defaults
       assert_equal "utf-16", @response.charset
-      assert_equal Mime::TEXT, @response.content_type
+      assert_equal Mime::Type[:TEXT], @response.content_type
     end
   end
 
   # :ported:
   def test_content_type_from_body
     get :render_content_type_from_body
-    assert_equal Mime::RSS, @response.content_type
+    assert_equal Mime::Type[:RSS], @response.content_type
     assert_equal "utf-8", @response.charset
   end
 
   # :ported:
   def test_content_type_from_render
     get :render_content_type_from_render
-    assert_equal Mime::RSS, @response.content_type
+    assert_equal Mime::Type[:RSS], @response.content_type
     assert_equal "utf-8", @response.charset
   end
 
   # :ported:
   def test_charset_from_body
     get :render_charset_from_body
-    assert_equal Mime::TEXT, @response.content_type
+    assert_equal Mime::Type[:TEXT], @response.content_type
     assert_equal "utf-16", @response.charset
   end
 
   # :ported:
   def test_nil_charset_from_body
     get :render_nil_charset_from_body
-    assert_equal Mime::TEXT, @response.content_type
+    assert_equal Mime::Type[:TEXT], @response.content_type
     assert_equal "utf-8", @response.charset, @response.headers.inspect
   end
 
   def test_nil_default_for_erb
     with_default_charset nil do
       get :render_default_for_erb
-      assert_equal Mime::HTML, @response.content_type
+      assert_equal Mime::Type[:HTML], @response.content_type
       assert_nil @response.charset, @response.headers.inspect
     end
   end
 
   def test_default_for_erb
     get :render_default_for_erb
-    assert_equal Mime::HTML, @response.content_type
+    assert_equal Mime::Type[:HTML], @response.content_type
     assert_equal "utf-8", @response.charset
   end
 
   def test_default_for_builder
     get :render_default_for_builder
-    assert_equal Mime::XML, @response.content_type
+    assert_equal Mime::Type[:XML], @response.content_type
     assert_equal "utf-8", @response.charset
   end
 
   def test_change_for_builder
     get :render_change_for_builder
-    assert_equal Mime::HTML, @response.content_type
+    assert_equal Mime::Type[:HTML], @response.content_type
     assert_equal "utf-8", @response.charset
   end
 
@@ -144,24 +144,24 @@ class AcceptBasedContentTypeTest < ActionController::TestCase
   tests OldContentTypeController
 
   def test_render_default_content_types_for_respond_to
-    @request.accept = Mime::HTML.to_s
+    @request.accept = Mime::Type[:HTML].to_s
     get :render_default_content_types_for_respond_to
-    assert_equal Mime::HTML, @response.content_type
+    assert_equal Mime::Type[:HTML], @response.content_type
 
-    @request.accept = Mime::JS.to_s
+    @request.accept = Mime::Type[:JS].to_s
     get :render_default_content_types_for_respond_to
-    assert_equal Mime::JS, @response.content_type
+    assert_equal Mime::Type[:JS], @response.content_type
   end
 
   def test_render_default_content_types_for_respond_to_with_template
-    @request.accept = Mime::XML.to_s
+    @request.accept = Mime::Type[:XML].to_s
     get :render_default_content_types_for_respond_to
-    assert_equal Mime::XML, @response.content_type
+    assert_equal Mime::Type[:XML], @response.content_type
   end
 
   def test_render_default_content_types_for_respond_to_with_overwrite
-    @request.accept = Mime::RSS.to_s
+    @request.accept = Mime::Type[:RSS].to_s
     get :render_default_content_types_for_respond_to
-    assert_equal Mime::XML, @response.content_type
+    assert_equal Mime::Type[:XML], @response.content_type
   end
 end
diff --git a/actionpack/test/controller/new_base/content_type_test.rb b/actionpack/test/controller/new_base/content_type_test.rb
index 0445a837ca..d9899fe01f 100644
--- a/actionpack/test/controller/new_base/content_type_test.rb
+++ b/actionpack/test/controller/new_base/content_type_test.rb
@@ -7,12 +7,12 @@ module ContentType
     end
 
     def set_on_response_obj
-      response.content_type = Mime::RSS
+      response.content_type = Mime::Type[:RSS]
       render body: "Hello world!"
     end
 
     def set_on_render
-      render body: "Hello world!", content_type: Mime::RSS
+      render body: "Hello world!", content_type: Mime::Type[:RSS]
     end
   end
 
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index af50e11261..8891f6177f 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -12,7 +12,7 @@ class RenderOtherTest < ActionController::TestCase
 
   def test_using_custom_render_option
     ActionController.add_renderer :simon do |says, options|
-      self.content_type  = Mime::TEXT
+      self.content_type  = Mime::Type[:TEXT]
       self.response_body = "Simon says: #{says}"
     end
 
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 7a91577b17..094d3ea1d2 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -92,6 +92,6 @@ class RenderXmlTest < ActionController::TestCase
 
   def test_should_use_implicit_content_type
     get :implicit_content_type, format: 'atom'
-    assert_equal Mime::ATOM, @response.content_type
+    assert_equal Mime::Type[:ATOM], @response.content_type
   end
 end
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index fb9883fb18..daa38ecbc4 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -89,7 +89,7 @@ class SendFileTest < ActionController::TestCase
   # Test that send_file_headers! is setting the correct HTTP headers.
   def test_send_file_headers_bang
     options = {
-      :type => Mime::PNG,
+      :type => Mime::Type[:PNG],
       :disposition => 'disposition',
       :filename => 'filename'
     }
@@ -115,7 +115,7 @@ class SendFileTest < ActionController::TestCase
 
   def test_send_file_headers_with_disposition_as_a_symbol
     options = {
-      :type => Mime::PNG,
+      :type => Mime::Type[:PNG],
       :disposition => :disposition,
       :filename => 'filename'
     }
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 8b37c9599e..2aee914a24 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -65,7 +65,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
 
   def test_register_and_use_json_simple
     with_test_route_set do
-      with_params_parsers Mime::JSON => Proc.new { |data| ActiveSupport::JSON.decode(data)['request'].with_indifferent_access } do
+      with_params_parsers Mime::Type[:JSON] => Proc.new { |data| ActiveSupport::JSON.decode(data)['request'].with_indifferent_access } do
         post "/",
           params: '{"request":{"summary":"content...","title":"JSON"}}',
           headers: { 'CONTENT_TYPE' => 'application/json' }
@@ -99,7 +99,7 @@ class WebServiceTest < ActionDispatch::IntegrationTest
   def test_parsing_json_doesnot_rescue_exception
     req = Class.new(ActionDispatch::Request) do
       def params_parsers
-        { Mime::JSON => Proc.new { |data| raise Interrupt } }
+        { Mime::Type[:JSON] => Proc.new { |data| raise Interrupt } }
       end
 
       def content_length; get_header('rack.input').length; end