3 files changed, 10 insertions, 29 deletions
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 7bf123d12b..ea68e63f8f 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -52,12 +52,11 @@ class ConsoleTest < ActiveSupport::TestCase
     a = b = c = nil
 
     # TODO: These should be defined on the initializer
-    ActionDispatch::Reloader.to_cleanup { a = b = c = 1 }
-    ActionDispatch::Reloader.to_cleanup { b = c = 2 }
-    ActionDispatch::Reloader.to_prepare { c = 3 }
+    ActiveSupport::Reloader.to_complete { a = b = c = 1 }
+    ActiveSupport::Reloader.to_complete { b = c = 2 }
+    ActiveSupport::Reloader.to_prepare { c = 3 }
 
-    # Hide Reloading... output
-    silence_stream(STDOUT) { irb_context.reload! }
+    irb_context.reload!(false)
 
     assert_equal 1, a
     assert_equal 2, b
@@ -81,7 +80,7 @@ class ConsoleTest < ActiveSupport::TestCase
     MODEL
 
     assert !User.new.respond_to?(:age)
-    silence_stream(STDOUT) { irb_context.reload! }
+    irb_context.reload!(false)
     assert User.new.respond_to?(:age)
   end
 
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 1434522cce..5869ff64bc 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -26,7 +26,7 @@ module ApplicationTests
       assert_equal [
         "Rack::Sendfile",
         "ActionDispatch::Static",
-        "ActionDispatch::LoadInterlock",
+        "ActionDispatch::Executor",
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "Rack::MethodOverride",
@@ -38,8 +38,6 @@ module ApplicationTests
         "ActionDispatch::Reloader",
         "ActionDispatch::Callbacks",
         "ActiveRecord::Migration::CheckPending",
-        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
-        "ActiveRecord::QueryCache",
         "ActionDispatch::Cookies",
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
@@ -57,7 +55,7 @@ module ApplicationTests
       assert_equal [
         "Rack::Sendfile",
         "ActionDispatch::Static",
-        "ActionDispatch::LoadInterlock",
+        "ActionDispatch::Executor",
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "ActionDispatch::RequestId",
@@ -67,8 +65,6 @@ module ApplicationTests
         "ActionDispatch::RemoteIp",
         "ActionDispatch::Reloader",
         "ActionDispatch::Callbacks",
-        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
-        "ActiveRecord::QueryCache",
         "Rack::Head",
         "Rack::ConditionalGet",
         "Rack::ETag"
@@ -114,23 +110,12 @@ module ApplicationTests
     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")
     end
 
-    test "includes interlock if cache_classes is set but eager_load is not" do
-      add_to_config "config.cache_classes = true"
-      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"
+    test "includes executor" do
       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,21 +123,18 @@ 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
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 92ae3edc08..dc3c4755c7 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -118,7 +118,7 @@ module ApplicationTests
     end
 
     def test_code_statistics_sanity
-      assert_match "Code LOC: 16     Test LOC: 0     Code to Test Ratio: 1:0.0",
+      assert_match "Code LOC: 18     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path){ `bin/rails stats` }
     end