Remove BestStandardsSupport middleware

9 files changed, 3 insertions, 108 deletions

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 9ab048b756..618e2f3033 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -47,7 +47,6 @@ module ActionDispatch
 
   autoload_under 'middleware' do
     autoload :RequestId
-    autoload :BestStandardsSupport
     autoload :Callbacks
     autoload :Cookies
     autoload :DebugExceptions
diff --git a/actionpack/lib/action_dispatch/middleware/best_standards_support.rb b/actionpack/lib/action_dispatch/middleware/best_standards_support.rb
deleted file mode 100644
index 94efeb79fa..0000000000
--- a/actionpack/lib/action_dispatch/middleware/best_standards_support.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module ActionDispatch
-  class BestStandardsSupport
-    def initialize(app, type = true)
-      @app = app
-
-      @header = case type
-      when true
-        "IE=Edge,chrome=1"
-      when :builtin
-        "IE=Edge"
-      when false
-        nil
-      end
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-
-      if headers["X-UA-Compatible"] && @header
-        unless headers["X-UA-Compatible"][@header]
-          headers["X-UA-Compatible"] << "," << @header.to_s
-        end
-      else
-        headers["X-UA-Compatible"] = @header
-      end
-
-      [status, headers, body]
-    end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 5a835ae439..2dfaab3587 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -6,7 +6,6 @@ module ActionDispatch
     config.action_dispatch.x_sendfile_header = nil
     config.action_dispatch.ip_spoofing_check = true
     config.action_dispatch.show_exceptions = true
-    config.action_dispatch.best_standards_support = true
     config.action_dispatch.tld_length = 1
     config.action_dispatch.ignore_accept_header = false
     config.action_dispatch.rescue_templates = { }
diff --git a/actionpack/test/dispatch/best_standards_support_test.rb b/actionpack/test/dispatch/best_standards_support_test.rb
deleted file mode 100644
index 551bb9621a..0000000000
--- a/actionpack/test/dispatch/best_standards_support_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'abstract_unit'
-
-class BestStandardsSupportTest < ActiveSupport::TestCase
-  def test_with_best_standards_support
-    _, headers, _ = app(true, {}).call({})
-    assert_equal "IE=Edge,chrome=1", headers["X-UA-Compatible"]
-  end
-
-  def test_with_builtin_best_standards_support
-    _, headers, _ = app(:builtin, {}).call({})
-    assert_equal "IE=Edge", headers["X-UA-Compatible"]
-  end
-
-  def test_without_best_standards_support
-    _, headers, _ = app(false, {}).call({})
-    assert_equal nil, headers["X-UA-Compatible"]
-  end
-
-  def test_appends_to_app_headers_without_duplication_after_multiple_requests
-    app_headers = { "X-UA-Compatible" => "requiresActiveX=true" }
-    _, headers, _ = app(true, app_headers).call({})
-    _, headers, _ = app(true, app_headers).call({})
-
-    expects = "requiresActiveX=true,IE=Edge,chrome=1"
-    assert_equal expects, headers["X-UA-Compatible"]
-  end
-
-  private
-
-    def app(type, headers)
-      app = proc { [200, headers, "response"] }
-      ActionDispatch::BestStandardsSupport.new(app, type)
-    end
-
-end
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 05cc49d40a..5af7de720c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -365,10 +365,6 @@ module Rails
         middleware.use ::Rack::Head
         middleware.use ::Rack::ConditionalGet
         middleware.use ::Rack::ETag, "no-cache"
-
-        if config.action_dispatch.best_standards_support
-          middleware.use ::ActionDispatch::BestStandardsSupport, config.action_dispatch.best_standards_support
-        end
       end
     end
 
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 5fa7f043c6..15d13d5f28 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -27,11 +27,11 @@ module Rails
     #
     # Middlewares can also be completely swapped out and replaced with others:
     #
-    #     config.middleware.swap ActionDispatch::BestStandardsSupport, Magical::Unicorns
+    #     config.middleware.swap ActionDispatch::Flash, Magical::Unicorns
     #
     # And finally they can also be removed from the stack completely:
     #
-    #     config.middleware.delete ActionDispatch::BestStandardsSupport
+    #     config.middleware.delete ActionDispatch::Flash
     #
     class MiddlewareStackProxy
       def initialize
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index bd0a0d44b8..c4cc1162a4 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -19,9 +19,6 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers.
-  config.action_dispatch.best_standards_support = :builtin
-
   <%- unless options.skip_active_record? -%>
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL).
diff --git a/railties/test/application/middleware/best_practices_test.rb b/railties/test/application/middleware/best_practices_test.rb
deleted file mode 100644
index f6783c6ca2..0000000000
--- a/railties/test/application/middleware/best_practices_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'isolation/abstract_unit'
-
-module ApplicationTests
-  class BestPracticesTest < ActiveSupport::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def setup
-      build_app
-      boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
-      simple_controller
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    test "simple controller in production mode returns best standards" do
-      get '/foo'
-      assert_equal "IE=Edge,chrome=1", last_response.headers["X-UA-Compatible"]
-    end
-
-    test "simple controller in development mode leaves out Chrome" do
-      app("development")
-      get "/foo"
-      assert_equal "IE=Edge", last_response.headers["X-UA-Compatible"]
-    end
-  end
-end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index c5a0d02fe1..73ef2046c0 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -45,8 +45,7 @@ module ApplicationTests
         "ActionDispatch::ParamsParser",
         "Rack::Head",
         "Rack::ConditionalGet",
-        "Rack::ETag",
-        "ActionDispatch::BestStandardsSupport"
+        "Rack::ETag"
       ], middleware
     end