2 files changed, 78 insertions, 17 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 5d18dfe369..99a3019f3a 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -511,7 +511,7 @@ module ActionDispatch
         end
 
         script_name = options.delete(:script_name)
-        path = (script_name.blank? ? _generate_prefix(options) : script_name).to_s
+        path = (script_name.blank? ? _generate_prefix(options) : script_name.chomp('/')).to_s
 
         path_options = options.except(*RESERVED_OPTIONS)
         path_options = yield(path_options) if block_given?
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index 26d76557dd..18f28deee4 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -1,8 +1,23 @@
 require 'abstract_unit'
+require 'rack/test'
 
 module TestGenerationPrefix
+  class Post
+    extend ActiveModel::Naming
+
+    def to_param
+      "1"
+    end
+
+    def self.model_name
+      klass = "Post"
+      def klass.name; self end
+
+      ActiveModel::Name.new(klass)
+    end
+  end
+
   class WithMountedEngine < ActionDispatch::IntegrationTest
-    require 'rack/test'
     include Rack::Test::Methods
 
     class BlogEngine
@@ -55,21 +70,6 @@ module TestGenerationPrefix
     # force draw
     RailsApplication.routes
 
-    class Post
-      extend ActiveModel::Naming
-
-      def to_param
-        "1"
-      end
-
-      def self.model_name
-        klass = "Post"
-        def klass.name; self end
-
-        ActiveModel::Name.new(klass)
-      end
-    end
-
     class ::InsideEngineGeneratingController < ActionController::Base
       include BlogEngine.routes.url_helpers
       include RailsApplication.routes.mounted_helpers
@@ -253,4 +253,65 @@ module TestGenerationPrefix
       assert_equal "http://www.example.com/awesome/blog/posts/1", path
     end
   end
+
+  class EngineMountedAtRoot < ActionDispatch::IntegrationTest
+    include Rack::Test::Methods
+
+    class BlogEngine
+      def self.routes
+        @routes ||= begin
+          routes = ActionDispatch::Routing::RouteSet.new
+          routes.draw do
+            match "/posts/:id", :to => "posts#show", :as => :post
+          end
+
+          routes
+        end
+      end
+
+      def self.call(env)
+        env['action_dispatch.routes'] = routes
+        routes.call(env)
+      end
+    end
+
+    class RailsApplication
+      def self.routes
+        @routes ||= begin
+          routes = ActionDispatch::Routing::RouteSet.new
+          routes.draw do
+            mount BlogEngine => "/"
+          end
+
+          routes
+        end
+      end
+
+      def self.call(env)
+        env['action_dispatch.routes'] = routes
+        routes.call(env)
+      end
+    end
+
+    # force draw
+    RailsApplication.routes
+
+    class ::PostsController < ActionController::Base
+      include BlogEngine.routes.url_helpers
+      include RailsApplication.routes.mounted_helpers
+
+      def show
+        render :text => post_path(:id => params[:id])
+      end
+    end
+
+    def app
+      RailsApplication
+    end
+
+    test "generating path inside engine" do
+      get "/posts/1"
+      assert_equal "/posts/1", last_response.body
+    end
+  end
 end