Merge commit 'mainstream/master'

1 files changed, 8 insertions, 1 deletions

diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb
index 5158abdbb4..5c3d35fb16 100644
--- a/railties/test/application/load_test.rb
+++ b/railties/test/application/load_test.rb
@@ -40,7 +40,14 @@ module ApplicationTests
 
     test "Rails.application is available after config.ru has been racked up" do
       rackup
-      assert Rails.application.new.is_a?(Rails::Application)
+      assert Rails.application.new < Rails::Application
+    end
+
+    # Passenger still uses AC::Dispatcher, so we need to
+    # keep it working for now
+    test "deprecated ActionController::Dispatcher still works" do
+      rackup
+      assert ActionController::Dispatcher.new < Rails::Application
     end
 
     test "the config object is available on the application object" do