2 files changed, 81 insertions, 20 deletions
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 234ae5764f..ff33dd5652 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -46,11 +46,32 @@ module ActionDispatch
 
         assert_equal [
           "       Prefix Verb URI Pattern              Controller#Action",
-          "custom_assets GET /custom/assets(.:format) custom_assets#show",
-          "         blog     /blog                    Blog::Engine",
+          "custom_assets GET  /custom/assets(.:format) custom_assets#show",
+          "         blog      /blog                    Blog::Engine",
           "",
           "Routes for Blog::Engine:",
-          "cart GET /cart(.:format) cart#show"
+          "  cart GET  /cart(.:format) cart#show"
+        ], 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
 
@@ -61,7 +82,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern     Controller#Action",
-          "cart GET /cart(.:format) cart#show"
+          "  cart GET  /cart(.:format) cart#show"
         ], output
       end
 
@@ -72,7 +93,7 @@ module ActionDispatch
 
         assert_equal [
           "       Prefix Verb URI Pattern              Controller#Action",
-          "custom_assets GET /custom/assets(.:format) custom_assets#show"
+          "custom_assets GET  /custom/assets(.:format) custom_assets#show"
         ], output
       end
 
@@ -101,7 +122,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern Controller#Action",
-          "root GET / pages#main"
+          "  root GET  /           pages#main"
         ], output
       end
 
@@ -112,7 +133,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern            Controller#Action",
-          " GET /api/:action(.:format) api#:action"
+          "       GET  /api/:action(.:format) api#:action"
         ], output
       end
 
@@ -123,7 +144,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern                    Controller#Action",
-          " GET /:controller/:action(.:format) :controller#:action"
+          "       GET  /:controller/:action(.:format) :controller#:action"
         ], output
       end
 
@@ -134,7 +155,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern                            Controller#Action",
-          " GET /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"
+          "       GET  /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"
         ], output
       end
 
@@ -145,7 +166,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern           Controller#Action",
-          %Q[ GET /photos/:id(.:format) photos#show {:format=>"jpg"}]
+          %Q[       GET  /photos/:id(.:format) photos#show {:format=>"jpg"}]
         ], output
       end
 
@@ -156,7 +177,30 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern           Controller#Action",
-          " GET /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"
+          "       GET  /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"
+        ], output
+      end
+
+      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
 
@@ -172,7 +216,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern        Controller#Action",
-          " GET /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"
+          "       GET  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"
         ], output
       end
 
@@ -191,7 +235,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern Controller#Action",
-          "  /foo #{RackApp.name} {:constraint=>( my custom constraint )}"
+          "            /foo        #{RackApp.name} {:constraint=>( my custom constraint )}"
         ], output
       end
 
@@ -203,6 +247,18 @@ module ActionDispatch
         assert_no_match(/\/sprockets/, output.first)
       end
 
+      def test_rake_routes_shows_route_defined_in_under_assets_prefix
+        output = draw do
+          scope '/sprockets' do
+            get '/foo' => 'foo#bar'
+          end
+        end
+        assert_equal [
+          "Prefix Verb URI Pattern              Controller#Action",
+          "   foo GET  /sprockets/foo(.:format) foo#bar"
+        ], output
+      end
+
       def test_redirect
         output = draw do
           get "/foo"    => redirect("/foo/bar"), :constraints => { :subdomain => "admin" }
@@ -212,9 +268,9 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern       Controller#Action",
-          "   foo GET /foo(.:format)    redirect(301, /foo/bar) {:subdomain=>\"admin\"}",
-          "   bar GET /bar(.:format)    redirect(307, path: /foo/bar)",
-          "foobar GET /foobar(.:format) redirect(301)"
+          "   foo GET  /foo(.:format)    redirect(301, /foo/bar) {:subdomain=>\"admin\"}",
+          "   bar GET  /bar(.:format)    redirect(307, path: /foo/bar)",
+          "foobar GET  /foobar(.:format) redirect(301)"
         ], output
       end
 
@@ -234,6 +290,15 @@ module ActionDispatch
                       "          PUT    /posts/:id(.:format)      posts#update",
                       "          DELETE /posts/:id(.:format)      posts#destroy"], output
       end
+
+      def test_regression_route_with_controller_regexp
+        output = draw do
+          get ':controller(/:action)', controller: /api\/[^\/]+/, format: false
+        end
+
+        assert_equal ["Prefix Verb URI Pattern            Controller#Action",
+                      "       GET  /:controller(/:action) (?-mix:api\\/[^\\/]+)#:action"], output
+      end
     end
   end
 end
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index 0e488d2b88..c465d56bde 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -81,10 +81,6 @@ module ActionDispatch
       end
 
       private
-        def clear!
-          @set.clear!
-        end
-
         def draw(&block)
           @set.draw(&block)
         end