1 files changed, 44 insertions, 13 deletions
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index f72a87b994..9d0d23d6de 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -133,7 +133,9 @@ module ActionDispatch
 
       def test_inspect_routes_shows_dynamic_action_route
         output = draw do
-          get 'api/:action' => 'api'
+          ActiveSupport::Deprecation.silence do
+            get 'api/:action' => 'api'
+          end
         end
 
         assert_equal [
@@ -144,7 +146,9 @@ module ActionDispatch
 
       def test_inspect_routes_shows_controller_and_action_only_route
         output = draw do
-          get ':controller/:action'
+          ActiveSupport::Deprecation.silence do
+            get ':controller/:action'
+          end
         end
 
         assert_equal [
@@ -155,7 +159,9 @@ module ActionDispatch
 
       def test_inspect_routes_shows_controller_and_action_route_with_constraints
         output = draw do
-          get ':controller(/:action(/:id))', :id => /\d+/
+          ActiveSupport::Deprecation.silence do
+            get ':controller(/:action(/:id))', :id => /\d+/
+          end
         end
 
         assert_equal [
@@ -164,7 +170,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_route_with_defaults
+      def test_rails_routes_shows_route_with_defaults
         output = draw do
           get 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
         end
@@ -175,7 +181,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_route_with_constraints
+      def test_rails_routes_shows_route_with_constraints
         output = draw do
           get 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
         end
@@ -186,7 +192,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_routes_with_dashes
+      def test_rails_routes_shows_routes_with_dashes
         output = draw do
           get 'about-us' => 'pages#about_us'
           get 'our-work/latest'
@@ -209,7 +215,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_route_with_rack_app
+      def test_rails_routes_shows_route_with_rack_app
         output = draw do
           get 'foo/:id' => MountedRackApp, :id => /[A-Z]\d{5}/
         end
@@ -220,7 +226,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_named_route_with_mounted_rack_app
+      def test_rails_routes_shows_named_route_with_mounted_rack_app
         output = draw do
           mount MountedRackApp => '/foo'
         end
@@ -231,7 +237,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_overridden_named_route_with_mounted_rack_app_with_name
+      def test_rails_routes_shows_overridden_named_route_with_mounted_rack_app_with_name
         output = draw do
           mount MountedRackApp => '/foo', as: 'blog'
         end
@@ -242,7 +248,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
+      def test_rails_routes_shows_route_with_rack_app_nested_with_dynamic_constraints
         constraint = Class.new do
           def inspect
             "( my custom constraint )"
@@ -261,7 +267,7 @@ module ActionDispatch
         ], output
       end
 
-      def test_rake_routes_dont_show_app_mounted_in_assets_prefix
+      def test_rails_routes_dont_show_app_mounted_in_assets_prefix
         output = draw do
           get '/sprockets' => MountedRackApp
         end
@@ -269,7 +275,7 @@ module ActionDispatch
         assert_no_match(/\/sprockets/, output.first)
       end
 
-      def test_rake_routes_shows_route_defined_in_under_assets_prefix
+      def test_rails_routes_shows_route_defined_in_under_assets_prefix
         output = draw do
           scope '/sprockets' do
             get '/foo' => 'foo#bar'
@@ -335,7 +341,9 @@ module ActionDispatch
 
       def test_regression_route_with_controller_regexp
         output = draw do
-          get ':controller(/:action)', controller: /api\/[^\/]+/, format: false
+          ActiveSupport::Deprecation.silence do
+            get ':controller(/:action)', controller: /api\/[^\/]+/, format: false
+          end
         end
 
         assert_equal ["Prefix Verb URI Pattern            Controller#Action",
@@ -389,6 +397,29 @@ module ActionDispatch
         ], output
       end
 
+      def test_displaying_routes_for_internal_engines
+        engine = Class.new(Rails::Engine) do
+          def self.inspect
+            "Blog::Engine"
+          end
+        end
+        engine.routes.draw do
+          get '/cart', to: 'cart#show'
+          post '/cart', to: 'cart#create'
+          patch '/cart', to: 'cart#update'
+        end
+
+        output = draw do
+          get '/custom/assets', to: 'custom_assets#show'
+          mount engine => "/blog", as: "blog", internal: true
+        end
+
+        assert_equal [
+          "       Prefix Verb URI Pattern              Controller#Action",
+          "custom_assets GET  /custom/assets(.:format) custom_assets#show",
+        ], output
+      end
+
     end
   end
 end