1 files changed, 78 insertions, 59 deletions

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 1434522cce..631f5bac7f 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -1,4 +1,6 @@
-require 'isolation/abstract_unit'
+# frozen_string_literal: true
+
+require "isolation/abstract_unit"
 
 module ApplicationTests
   class MiddlewareTest < ActiveSupport::TestCase
@@ -6,7 +8,6 @@ module ApplicationTests
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
@@ -24,28 +25,29 @@ module ApplicationTests
       boot!
 
       assert_equal [
+        "Webpacker::DevServerProxy",
         "Rack::Sendfile",
         "ActionDispatch::Static",
-        "ActionDispatch::LoadInterlock",
+        "ActionDispatch::Executor",
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "Rack::MethodOverride",
         "ActionDispatch::RequestId",
-        "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
+        "ActionDispatch::RemoteIp",
+        "Rails::Rack::Logger",
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::DebugExceptions",
-        "ActionDispatch::RemoteIp",
         "ActionDispatch::Reloader",
         "ActionDispatch::Callbacks",
         "ActiveRecord::Migration::CheckPending",
-        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
-        "ActiveRecord::QueryCache",
         "ActionDispatch::Cookies",
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
+        "ActionDispatch::ContentSecurityPolicy::Middleware",
         "Rack::Head",
         "Rack::ConditionalGet",
-        "Rack::ETag"
+        "Rack::ETag",
+        "Rack::TempfileReaper"
       ], middleware
     end
 
@@ -55,30 +57,60 @@ module ApplicationTests
       boot!
 
       assert_equal [
+        "Webpacker::DevServerProxy",
         "Rack::Sendfile",
         "ActionDispatch::Static",
-        "ActionDispatch::LoadInterlock",
+        "ActionDispatch::Executor",
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "ActionDispatch::RequestId",
-        "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
+        "ActionDispatch::RemoteIp",
+        "Rails::Rack::Logger",
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::DebugExceptions",
-        "ActionDispatch::RemoteIp",
         "ActionDispatch::Reloader",
         "ActionDispatch::Callbacks",
-        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
-        "ActiveRecord::QueryCache",
         "Rack::Head",
         "Rack::ConditionalGet",
         "Rack::ETag"
       ], middleware
     end
 
+    test "middleware dependencies" do
+      boot!
+
+      # The following array-of-arrays describes dependencies between
+      # middlewares: the first item in each list depends on the
+      # remaining items (and therefore must occur later in the
+      # middleware stack).
+
+      dependencies = [
+        # Logger needs a fully "corrected" request environment
+        %w(Rails::Rack::Logger Rack::MethodOverride ActionDispatch::RequestId ActionDispatch::RemoteIp),
+
+        # Serving public/ doesn't invoke user code, so it should skip
+        # locks etc
+        %w(ActionDispatch::Executor ActionDispatch::Static),
+
+        # Errors during reload must be reported
+        %w(ActionDispatch::Reloader ActionDispatch::ShowExceptions ActionDispatch::DebugExceptions),
+
+        # Outright dependencies
+        %w(ActionDispatch::Static Rack::Sendfile),
+        %w(ActionDispatch::Flash ActionDispatch::Session::CookieStore),
+        %w(ActionDispatch::Session::CookieStore ActionDispatch::Cookies),
+      ]
+
+      require "tsort"
+      sorted = TSort.tsort((middleware | dependencies.flatten).method(:each),
+                           lambda { |n, &b| dependencies.each { |m, *ds| ds.each(&b) if m == n } })
+      assert_equal sorted, middleware
+    end
+
     test "Rack::Cache is not included by default" do
       boot!
 
-      assert !middleware.include?("Rack::Cache"), "Rack::Cache is not included in the default stack unless you set config.action_dispatch.rack_cache"
+      assert_not_includes middleware, "Rack::Cache", "Rack::Cache is not included in the default stack unless you set config.action_dispatch.rack_cache"
     end
 
     test "Rack::Cache is present when action_dispatch.rack_cache is set" do
@@ -86,7 +118,7 @@ module ApplicationTests
 
       boot!
 
-      assert middleware.include?("Rack::Cache")
+      assert_includes middleware, "Rack::Cache"
     end
 
     test "ActiveRecord::Migration::CheckPending is present when active_record.migration_error is set to :page_load" do
@@ -94,43 +126,32 @@ module ApplicationTests
 
       boot!
 
-      assert middleware.include?("ActiveRecord::Migration::CheckPending")
+      assert_includes middleware, "ActiveRecord::Migration::CheckPending"
     end
 
     test "ActionDispatch::SSL is present when force_ssl is set" do
       add_to_config "config.force_ssl = true"
       boot!
-      assert middleware.include?("ActionDispatch::SSL")
+      assert_includes middleware, "ActionDispatch::SSL"
     end
 
     test "ActionDispatch::SSL is configured with options when given" do
       add_to_config "config.force_ssl = true"
-      add_to_config "config.ssl_options = { host: 'example.com' }"
+      add_to_config "config.ssl_options = { redirect: { host: 'example.com' } }"
       boot!
 
-      assert_equal [{host: 'example.com'}], Rails.application.middleware.first.args
+      assert_equal [{ redirect: { host: "example.com" } }], Rails.application.middleware[1].args
     end
 
     test "removing Active Record omits its middleware" do
       use_frameworks []
       boot!
-      assert !middleware.include?("ActiveRecord::ConnectionAdapters::ConnectionManagement")
-      assert !middleware.include?("ActiveRecord::QueryCache")
-      assert !middleware.include?("ActiveRecord::Migration::CheckPending")
+      assert_not_includes middleware, "ActiveRecord::Migration::CheckPending"
     end
 
-    test "includes interlock if cache_classes is set but eager_load is not" do
-      add_to_config "config.cache_classes = true"
+    test "includes executor" do
       boot!
-      assert_not_includes middleware, "Rack::Lock"
-      assert_includes middleware, "ActionDispatch::LoadInterlock"
-    end
-
-    test "includes interlock if cache_classes is off" do
-      add_to_config "config.cache_classes = false"
-      boot!
-      assert_not_includes middleware, "Rack::Lock"
-      assert_includes middleware, "ActionDispatch::LoadInterlock"
+      assert_includes middleware, "ActionDispatch::Executor"
     end
 
     test "does not include lock if cache_classes is set and so is eager_load" do
@@ -138,40 +159,37 @@ module ApplicationTests
       add_to_config "config.eager_load = true"
       boot!
       assert_not_includes middleware, "Rack::Lock"
-      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
     end
 
     test "does not include lock if allow_concurrency is set to :unsafe" do
       add_to_config "config.allow_concurrency = :unsafe"
       boot!
       assert_not_includes middleware, "Rack::Lock"
-      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
     end
 
     test "includes lock if allow_concurrency is disabled" do
       add_to_config "config.allow_concurrency = false"
       boot!
       assert_includes middleware, "Rack::Lock"
-      assert_not_includes middleware, "ActionDispatch::LoadInterlock"
     end
 
     test "removes static asset server if public_file_server.enabled is disabled" do
       add_to_config "config.public_file_server.enabled = false"
       boot!
-      assert !middleware.include?("ActionDispatch::Static")
+      assert_not_includes middleware, "ActionDispatch::Static"
     end
 
     test "can delete a middleware from the stack" do
       add_to_config "config.middleware.delete ActionDispatch::Static"
       boot!
-      assert !middleware.include?("ActionDispatch::Static")
+      assert_not_includes middleware, "ActionDispatch::Static"
     end
 
     test "can delete a middleware from the stack even if insert_before is added after delete" do
       add_to_config "config.middleware.delete Rack::Runtime"
       add_to_config "config.middleware.insert_before(Rack::Runtime, Rack::Config)"
       boot!
-      assert middleware.include?("Rack::Config")
+      assert_includes middleware, "Rack::Config"
       assert_not middleware.include?("Rack::Runtime")
     end
 
@@ -179,21 +197,21 @@ module ApplicationTests
       add_to_config "config.middleware.delete Rack::Runtime"
       add_to_config "config.middleware.insert_after(Rack::Runtime, Rack::Config)"
       boot!
-      assert middleware.include?("Rack::Config")
+      assert_includes middleware, "Rack::Config"
       assert_not middleware.include?("Rack::Runtime")
     end
 
     test "includes exceptions middlewares even if action_dispatch.show_exceptions is disabled" do
       add_to_config "config.action_dispatch.show_exceptions = false"
       boot!
-      assert middleware.include?("ActionDispatch::ShowExceptions")
-      assert middleware.include?("ActionDispatch::DebugExceptions")
+      assert_includes middleware, "ActionDispatch::ShowExceptions"
+      assert_includes middleware, "ActionDispatch::DebugExceptions"
     end
 
     test "removes ActionDispatch::Reloader if cache_classes is true" do
       add_to_config "config.cache_classes = true"
       boot!
-      assert !middleware.include?("ActionDispatch::Reloader")
+      assert_not_includes middleware, "ActionDispatch::Reloader"
     end
 
     test "use middleware" do
@@ -206,35 +224,36 @@ module ApplicationTests
     test "insert middleware after" do
       add_to_config "config.middleware.insert_after Rack::Sendfile, Rack::Config"
       boot!
-      assert_equal "Rack::Config", middleware.second
+      assert_equal "Rack::Config", middleware.third
     end
 
-    test 'unshift middleware' do
-      add_to_config 'config.middleware.unshift Rack::Config'
+    test "unshift middleware" do
+      add_to_config "config.middleware.unshift Rack::Config"
       boot!
-      assert_equal 'Rack::Config', middleware.first
+      assert_equal "Rack::Config", middleware.second
     end
 
     test "Rails.cache does not respond to middleware" do
       add_to_config "config.cache_store = :memory_store"
       boot!
-      assert_equal "Rack::Runtime", middleware.fourth
+      assert_equal "Rack::Runtime", middleware.fifth
     end
 
     test "Rails.cache does respond to middleware" do
       boot!
-      assert_equal "Rack::Runtime", middleware.fifth
+      assert_equal "ActiveSupport::Cache::Strategy::LocalCache", middleware.fifth
+      assert_equal "Rack::Runtime", middleware[5]
     end
 
     test "insert middleware before" do
       add_to_config "config.middleware.insert_before Rack::Sendfile, Rack::Config"
       boot!
-      assert_equal "Rack::Config", middleware.first
+      assert_equal "Rack::Config", middleware.second
     end
 
     test "can't change middleware after it's built" do
       boot!
-      assert_raise RuntimeError do
+      assert_raise frozen_error_class do
         app.config.middleware.use Rack::Config
       end
     end
@@ -246,35 +265,35 @@ module ApplicationTests
       class ::OmgController < ActionController::Base
         def index
           if params[:nothing]
-            render text: ""
+            render plain: ""
           else
-            render text: "OMG"
+            render plain: "OMG"
           end
         end
       end
 
-      etag = "W/" + "5af83e3196bf99f440f31f2e1a6c9afe".inspect
+      etag = "W/" + "c00862d1c6c1cf7c1b49388306e7b3c1".inspect
 
       get "/"
       assert_equal 200, last_response.status
       assert_equal "OMG", last_response.body
-      assert_equal "text/html; charset=utf-8", last_response.headers["Content-Type"]
+      assert_equal "text/plain; charset=utf-8", last_response.headers["Content-Type"]
       assert_equal "max-age=0, private, must-revalidate", last_response.headers["Cache-Control"]
       assert_equal etag, last_response.headers["Etag"]
 
-      get "/", {}, "HTTP_IF_NONE_MATCH" => etag
+      get "/", {}, { "HTTP_IF_NONE_MATCH" => etag }
       assert_equal 304, last_response.status
       assert_equal "", last_response.body
-      assert_equal nil, last_response.headers["Content-Type"]
+      assert_nil last_response.headers["Content-Type"]
       assert_equal "max-age=0, private, must-revalidate", last_response.headers["Cache-Control"]
       assert_equal etag, last_response.headers["Etag"]
 
       get "/?nothing=true"
       assert_equal 200, last_response.status
       assert_equal "", last_response.body
-      assert_equal "text/html; charset=utf-8", last_response.headers["Content-Type"]
+      assert_equal "text/plain; charset=utf-8", last_response.headers["Content-Type"]
       assert_equal "no-cache", last_response.headers["Cache-Control"]
-      assert_equal nil, last_response.headers["Etag"]
+      assert_nil last_response.headers["Etag"]
     end
 
     test "ORIGINAL_FULLPATH is passed to env" do