3 files changed, 124 insertions, 13 deletions
diff --git a/actionpack/test/dispatch/routing/concerns_test.rb b/actionpack/test/dispatch/routing/concerns_test.rb
index 9f37701656..7ef513b0c8 100644
--- a/actionpack/test/dispatch/routing/concerns_test.rb
+++ b/actionpack/test/dispatch/routing/concerns_test.rb
@@ -36,7 +36,8 @@ class RoutingConcernsTest < ActionDispatch::IntegrationTest
   end
 
   include Routes.url_helpers
-  def app; Routes end
+  APP = RoutedRackApp.new Routes
+  def app; APP end
 
   def test_accessing_concern_from_resources
     get "/posts/1/comments"
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 18a52f13a7..3d3d4b74ae 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -2,6 +2,11 @@ require 'abstract_unit'
 require 'rails/engine'
 require 'action_dispatch/routing/inspector'
 
+class MountedRackApp
+  def self.call(env)
+  end
+end
+
 module ActionDispatch
   module Routing
     class RoutesInspectorTest < ActiveSupport::TestCase
@@ -54,6 +59,27 @@ module ActionDispatch
         ], output
       end
 
+      def test_displaying_routes_for_engines_without_routes
+        engine = Class.new(Rails::Engine) do
+          def self.inspect
+            "Blog::Engine"
+          end
+        end
+        engine.routes.draw do
+        end
+
+        output = draw do
+          mount engine => "/blog", as: "blog"
+        end
+
+        assert_equal [
+          "Prefix Verb URI Pattern Controller#Action",
+          "  blog      /blog       Blog::Engine",
+          "",
+          "Routes for Blog::Engine:"
+        ], output
+      end
+
       def test_cart_inspect
         output = draw do
           get '/cart', :to => 'cart#show'
@@ -160,19 +186,59 @@ module ActionDispatch
         ], output
       end
 
-      class RackApp
-        def self.call(env)
+      def test_rake_routes_shows_routes_with_dashes
+        output = draw do
+          get 'about-us' => 'pages#about_us'
+          get 'our-work/latest'
+
+          resources :photos, only: [:show] do
+            get 'user-favorites', on: :collection
+            get 'preview-photo', on: :member
+            get 'summary-text'
+          end
         end
+
+        assert_equal [
+          "               Prefix Verb URI Pattern                              Controller#Action",
+          "             about_us GET  /about-us(.:format)                      pages#about_us",
+          "      our_work_latest GET  /our-work/latest(.:format)               our_work#latest",
+          "user_favorites_photos GET  /photos/user-favorites(.:format)         photos#user_favorites",
+          "  preview_photo_photo GET  /photos/:id/preview-photo(.:format)      photos#preview_photo",
+          "   photo_summary_text GET  /photos/:photo_id/summary-text(.:format) photos#summary_text",
+          "                photo GET  /photos/:id(.:format)                    photos#show"
+        ], output
       end
 
       def test_rake_routes_shows_route_with_rack_app
         output = draw do
-          get 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
+          get 'foo/:id' => MountedRackApp, :id => /[A-Z]\d{5}/
         end
 
         assert_equal [
           "Prefix Verb URI Pattern        Controller#Action",
-          "       GET  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"
+          "       GET  /foo/:id(.:format) MountedRackApp {:id=>/[A-Z]\\d{5}/}"
+        ], output
+      end
+
+      def test_rake_routes_shows_named_route_with_mounted_rack_app
+        output = draw do
+          mount MountedRackApp => '/foo'
+        end
+
+        assert_equal [
+          "          Prefix Verb URI Pattern Controller#Action",
+          "mounted_rack_app      /foo        MountedRackApp"
+        ], output
+      end
+
+      def test_rake_routes_shows_overridden_named_route_with_mounted_rack_app_with_name
+        output = draw do
+          mount MountedRackApp => '/foo', as: 'blog'
+        end
+
+        assert_equal [
+          "Prefix Verb URI Pattern Controller#Action",
+          "  blog      /foo        MountedRackApp"
         ], output
       end
 
@@ -185,21 +251,21 @@ module ActionDispatch
 
         output = draw do
           scope :constraint => constraint.new do
-            mount RackApp => '/foo'
+            mount MountedRackApp => '/foo'
           end
         end
 
         assert_equal [
-          "Prefix Verb URI Pattern Controller#Action",
-          "            /foo        #{RackApp.name} {:constraint=>( my custom constraint )}"
+          "          Prefix Verb URI Pattern Controller#Action",
+          "mounted_rack_app      /foo        MountedRackApp {:constraint=>( my custom constraint )}"
         ], output
       end
 
       def test_rake_routes_dont_show_app_mounted_in_assets_prefix
         output = draw do
-          get '/sprockets' => RackApp
+          get '/sprockets' => MountedRackApp
         end
-        assert_no_match(/RackApp/, output.first)
+        assert_no_match(/MountedRackApp/, output.first)
         assert_no_match(/\/sprockets/, output.first)
       end
 
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index 0e488d2b88..fe52c50336 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -69,6 +69,42 @@ module ActionDispatch
         end
       end
 
+      test "only_path: true with *_url and no :host option" do
+        draw do
+          get 'foo', to: SimpleApp.new('foo#index')
+        end
+
+        assert_equal '/foo', url_helpers.foo_url(only_path: true)
+      end
+
+      test "only_path: false with *_url and no :host option" do
+        draw do
+          get 'foo', to: SimpleApp.new('foo#index')
+        end
+
+        assert_raises ArgumentError do
+          assert_equal 'http://example.com/foo', url_helpers.foo_url(only_path: false)
+        end
+      end
+
+      test "only_path: false with *_url and local :host option" do
+        draw do
+          get 'foo', to: SimpleApp.new('foo#index')
+        end
+
+        assert_equal 'http://example.com/foo', url_helpers.foo_url(only_path: false, host: 'example.com')
+      end
+
+      test "only_path: false with *_url and global :host option" do
+        @set.default_url_options = { host: 'example.com' }
+
+        draw do
+          get 'foo', to: SimpleApp.new('foo#index')
+        end
+
+        assert_equal 'http://example.com/foo', url_helpers.foo_url(only_path: false)
+      end
+
       test "explicit keys win over implicit keys" do
         draw do
           resources :foo do
@@ -80,11 +116,19 @@ module ActionDispatch
         assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(2, foo_id: 1)
       end
 
-      private
-        def clear!
-          @set.clear!
+      test "having an optional scope with resources" do
+        draw do
+          scope "(/:foo)" do
+            resources :users
+          end
         end
 
+        assert_equal '/users/1', url_helpers.user_path(1)
+        assert_equal '/users/1', url_helpers.user_path(1, foo: nil)
+        assert_equal '/a/users/1', url_helpers.user_path(1, foo: 'a')
+      end
+
+      private
         def draw(&block)
           @set.draw(&block)
         end