1 files changed, 12 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index 2b54bc62b0..e56e8ddc57 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 module TestUrlGeneration
   class WithMountPoint < ActionDispatch::IntegrationTest
     Routes = ActionDispatch::Routing::RouteSet.new
-    Routes.draw { match "/foo", :to => "my_route_generating#index", :as => :foo }
+    include Routes.url_helpers
 
     class ::MyRouteGeneratingController < ActionController::Base
       include Routes.url_helpers
@@ -12,7 +12,11 @@ module TestUrlGeneration
       end
     end
 
-    include Routes.url_helpers
+    Routes.draw do
+      get "/foo", :to => "my_route_generating#index", :as => :foo
+
+      mount MyRouteGeneratingController.action(:index), at: '/bar'
+    end
 
     def _routes
       Routes
@@ -30,11 +34,16 @@ module TestUrlGeneration
       assert_equal "/bar/foo", foo_path(:script_name => "/bar")
     end
 
-    test "the request's SCRIPT_NAME takes precedence over the routes'" do
+    test "the request's SCRIPT_NAME takes precedence over the route" do
       get "/foo", {}, 'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes
       assert_equal "/new/foo", response.body
     end
 
+    test "the request's SCRIPT_NAME wraps the mounted app's" do
+      get '/new/bar/foo', {}, 'SCRIPT_NAME' => '/new', 'PATH_INFO' => '/bar/foo', 'action_dispatch.routes' => Routes
+      assert_equal "/new/bar/foo", response.body
+    end
+
     test "handling http protocol with https set" do
       https!
       assert_equal "http://www.example.com/foo", foo_url(:protocol => "http")