1 files changed, 17 insertions, 8 deletions
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index 683a4f01e2..d5a4d8ee11 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -1,12 +1,18 @@
 require 'abstract_unit'
+require 'rails/engine'
 
 class TestRoutingMount < ActionDispatch::IntegrationTest
   Router = ActionDispatch::Routing::RouteSet.new
 
-  class FakeEngine
+  class AppWithRoutes < Rails::Engine
     def self.routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
     end
+  end
+
+  # Test for mounting apps that respond to routes, but aren't Rails-like apps.
+  class SinatraLikeApp
+    def self.routes; Object.new; end
 
     def self.call(env)
       [200, {"Content-Type" => "text/html"}, ["OK"]]
@@ -21,20 +27,23 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     mount SprocketsApp, :at => "/sprockets"
     mount SprocketsApp => "/shorthand"
 
-    mount FakeEngine, :at => "/fakeengine", :as => :fake
-    mount FakeEngine, :at => "/getfake", :via => :get
+    mount SinatraLikeApp, :at => "/fakeengine", :as => :fake
+    mount SinatraLikeApp, :at => "/getfake", :via => :get
 
     scope "/its_a" do
       mount SprocketsApp, :at => "/sprocket"
     end
 
     resources :users do
-      mount FakeEngine, :at => "/fakeengine", :as => :fake_mounted_at_resource
+      mount AppWithRoutes, :at => "/fakeengine", :as => :fake_mounted_at_resource
     end
+
+    mount SprocketsApp, :at => "/", :via => :get
   end
 
+  APP = RoutedRackApp.new Router
   def app
-    Router
+    APP
   end
 
   def test_app_name_is_properly_generated_when_engine_is_mounted_in_resources
@@ -44,9 +53,9 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
           "A named route should be defined with a parent's prefix"
   end
 
-  def test_trailing_slash_is_not_removed_from_path_info
-    get "/sprockets/omg/"
-    assert_equal "/sprockets -- /omg/", response.body
+  def test_mounting_at_root_path
+    get "/omg"
+    assert_equal " -- /omg", response.body
   end
 
   def test_mounting_sets_script_name