1 files changed, 40 insertions, 18 deletions

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index c5a0d02fe1..caef39d16f 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -19,7 +19,7 @@ module ApplicationTests
     end
 
     test "default middleware stack" do
-      add_to_config "config.action_dispatch.x_sendfile_header = 'X-Sendfile'"
+      add_to_config "config.active_record.migration_error = :page_load"
 
       boot!
 
@@ -37,6 +37,7 @@ module ApplicationTests
         "ActionDispatch::RemoteIp",
         "ActionDispatch::Reloader",
         "ActionDispatch::Callbacks",
+        "ActiveRecord::Migration::CheckPending",
         "ActiveRecord::ConnectionAdapters::ConnectionManagement",
         "ActiveRecord::QueryCache",
         "ActionDispatch::Cookies",
@@ -45,17 +46,10 @@ module ApplicationTests
         "ActionDispatch::ParamsParser",
         "Rack::Head",
         "Rack::ConditionalGet",
-        "Rack::ETag",
-        "ActionDispatch::BestStandardsSupport"
+        "Rack::ETag"
       ], middleware
     end
 
-    test "Rack::Sendfile is not included by default" do
-      boot!
-
-      assert !middleware.include?("Rack::Sendfile"), "Rack::Sendfile is not included in the default stack unless you set config.action_dispatch.x_sendfile_header"
-    end
-
     test "Rack::Cache is not included by default" do
       boot!
 
@@ -67,7 +61,15 @@ module ApplicationTests
 
       boot!
 
-      assert_equal "Rack::Cache", middleware.first
+      assert middleware.include?("Rack::Cache")
+    end
+
+    test "ActiveRecord::Migration::CheckPending is present when active_record.migration_error is set to :page_load" do
+      add_to_config "config.active_record.migration_error = :page_load"
+
+      boot!
+
+      assert middleware.include?("ActiveRecord::Migration::CheckPending")
     end
 
     test "ActionDispatch::SSL is present when force_ssl is set" do
@@ -81,7 +83,7 @@ module ApplicationTests
       add_to_config "config.ssl_options = { host: 'example.com' }"
       boot!
 
-      assert_equal AppTemplate::Application.middleware.first.args, [{host: 'example.com'}]
+      assert_equal [{host: 'example.com'}], Rails.application.middleware.first.args
     end
 
     test "removing Active Record omits its middleware" do
@@ -89,10 +91,24 @@ module ApplicationTests
       boot!
       assert !middleware.include?("ActiveRecord::ConnectionAdapters::ConnectionManagement")
       assert !middleware.include?("ActiveRecord::QueryCache")
+      assert !middleware.include?("ActiveRecord::Migration::CheckPending")
+    end
+
+    test "includes lock if cache_classes is set but eager_load is not" do
+      add_to_config "config.cache_classes = true"
+      boot!
+      assert middleware.include?("Rack::Lock")
     end
 
-    test "removes lock if cache classes is set" do
+    test "does not include lock if cache_classes is set and so is eager_load" do
       add_to_config "config.cache_classes = true"
+      add_to_config "config.eager_load = true"
+      boot!
+      assert !middleware.include?("Rack::Lock")
+    end
+
+    test "does not include lock if allow_concurrency is set" do
+      add_to_config "config.allow_concurrency = true"
       boot!
       assert !middleware.include?("Rack::Lock")
     end
@@ -130,24 +146,30 @@ module ApplicationTests
     end
 
     test "insert middleware after" do
-      add_to_config "config.middleware.insert_after ActionDispatch::Static, Rack::Config"
+      add_to_config "config.middleware.insert_after Rack::Sendfile, Rack::Config"
       boot!
       assert_equal "Rack::Config", middleware.second
     end
 
+    test 'unshift middleware' do
+      add_to_config 'config.middleware.unshift Rack::Config'
+      boot!
+      assert_equal 'Rack::Config', middleware.first
+    end
+
     test "Rails.cache does not respond to middleware" do
       add_to_config "config.cache_store = :memory_store"
       boot!
-      assert_equal "Rack::Runtime", middleware.third
+      assert_equal "Rack::Runtime", middleware.fourth
     end
 
     test "Rails.cache does respond to middleware" do
       boot!
-      assert_equal "Rack::Runtime", middleware.fourth
+      assert_equal "Rack::Runtime", middleware.fifth
     end
 
     test "insert middleware before" do
-      add_to_config "config.middleware.insert_before ActionDispatch::Static, Rack::Config"
+      add_to_config "config.middleware.insert_before Rack::Sendfile, Rack::Config"
       boot!
       assert_equal "Rack::Config", middleware.first
     end
@@ -173,7 +195,7 @@ module ApplicationTests
         end
       end
 
-      etag = "5af83e3196bf99f440f31f2e1a6c9afe".inspect
+      etag = "W/" + "5af83e3196bf99f440f31f2e1a6c9afe".inspect
 
       get "/"
       assert_equal 200, last_response.status
@@ -212,7 +234,7 @@ module ApplicationTests
       end
 
       def middleware
-        AppTemplate::Application.middleware.map(&:klass).map(&:name)
+        Rails.application.middleware.map(&:klass).map(&:name)
       end
   end
 end