From 74f2b41ce06492da307c7f00b011a8c5106e1151 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 2 Jun 2013 00:07:58 +0900
Subject: [PATCH] Remove Mime::Type#verify_request? and
 Mime::Type.browser_generated_types were deprecated.

---
 actionpack/lib/action_dispatch/http/mime_type.rb | 16 ----------------
 actionpack/test/dispatch/mime_type_test.rb       |  5 -----
 actionpack/test/dispatch/rack_test.rb            | 16 ----------------
 3 files changed, 37 deletions(-)

diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index f29ad359ac..61dbf2b96c 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -53,10 +53,6 @@ class Type
     @@html_types = Set.new [:html, :all]
     cattr_reader :html_types
 
-    # These are the content types which browsers can generate without using ajax, flash, etc
-    # i.e. following a link, getting an image or posting a form. CSRF protection
-    # only needs to protect against these types.
-    @@browser_generated_types = Set.new [:html, :url_encoded_form, :multipart_form, :text]
     attr_reader :symbol
 
     @register_callbacks = []
@@ -272,18 +268,6 @@ def =~(mime_type)
       end
     end
 
-    # Returns true if Action Pack should check requests using this Mime Type for possible request forgery. See
-    # ActionController::RequestForgeryProtection.
-    def verify_request?
-      ActiveSupport::Deprecation.warn "Mime::Type#verify_request? is deprecated and will be removed in Rails 4.1"
-      @@browser_generated_types.include?(to_sym)
-    end
-
-    def self.browser_generated_types
-      ActiveSupport::Deprecation.warn "Mime::Type.browser_generated_types is deprecated and will be removed in Rails 4.1"
-      @@browser_generated_types
-    end
-
     def html?
       @@html_types.include?(to_sym) || @string =~ /html/
     end
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 6a2eb7da9f..8a19129695 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -185,11 +185,6 @@ class MimeTypeTest < ActiveSupport::TestCase
     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) }
-    assert_deprecated do
-      verified, unverified = all_types.partition { |type| Mime::Type.browser_generated_types.include? type }
-      assert verified.each   { |type| assert  Mime.const_get(type.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
-      assert unverified.each { |type| assert !Mime.const_get(type.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
-    end
   end
 
   test "references gives preference to symbols before strings" do
diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
index 6d239d0a0c..42067854ee 100644
--- a/actionpack/test/dispatch/rack_test.rb
+++ b/actionpack/test/dispatch/rack_test.rb
@@ -174,22 +174,6 @@ class RackRequestParamsParsingTest < BaseRackTest
   end
 end
 
-class RackRequestContentTypeTest < BaseRackTest
-  test "html content type verification" do
-    assert_deprecated do
-      @request.env['CONTENT_TYPE'] = Mime::HTML.to_s
-      assert @request.content_mime_type.verify_request?
-    end
-  end
-
-  test "xml content type verification" do
-    assert_deprecated do
-      @request.env['CONTENT_TYPE'] = Mime::XML.to_s
-      assert !@request.content_mime_type.verify_request?
-    end
-  end
-end
-
 class RackRequestNeedsRewoundTest < BaseRackTest
   test "body should be rewound" do
     data = 'foo'
-- 
GitLab