4 files changed, 10 insertions, 24 deletions
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'
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 74f5253c11..2fbe7358f9 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -182,8 +182,7 @@ class ResponseTest < ActiveSupport::TestCase
       ActionDispatch::Response.default_headers = {
         'X-Frame-Options' => 'DENY',
         'X-Content-Type-Options' => 'nosniff',
-        'X-XSS-Protection' => '1;',
-        'X-UA-Compatible' => 'chrome=1'
+        'X-XSS-Protection' => '1;'
       }
       resp = ActionDispatch::Response.new.tap { |response|
         response.body = 'Hello'
@@ -193,7 +192,6 @@ class ResponseTest < ActiveSupport::TestCase
       assert_equal('DENY', resp.headers['X-Frame-Options'])
       assert_equal('nosniff', resp.headers['X-Content-Type-Options'])
       assert_equal('1;', resp.headers['X-XSS-Protection'])
-      assert_equal('chrome=1', resp.headers['X-UA-Compatible'])
     ensure
       ActionDispatch::Response.default_headers = nil
     end
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 234ae5764f..4f97d28d2b 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -234,6 +234,15 @@ module ActionDispatch
                       "          PUT    /posts/:id(.:format)      posts#update",
                       "          DELETE /posts/:id(.:format)      posts#destroy"], output
       end
+
+      def test_regression_route_with_controller_regexp
+        output = draw do
+          get ':controller(/:action)', controller: /api\/[^\/]+/, format: false
+        end
+
+        assert_equal ["Prefix Verb URI Pattern            Controller#Action",
+                      " GET /:controller(/:action) (?-mix:api\\/[^\\/]+)#:action"], output
+      end
     end
   end
 end