Merge pull request #25693 from volmer/master

Deprecate usage of nil as route path

2 files changed, 13 insertions, 0 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e2cf75da3a..73b4864e45 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1562,6 +1562,12 @@ module ActionDispatch
             options  = path
             path, to = options.find { |name, _value| name.is_a?(String) }
 
+            if path.nil?
+              ActiveSupport::Deprecation.warn 'Omitting the route path is deprecated. '\
+                'Specify the path with a String or a Symbol instead.'
+              path = ''
+            end
+
             case to
             when Symbol
               options[:action] = to
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 75fdc9469f..d54cdf7247 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -373,6 +373,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         post "create", :as => ""
         put  "update"
         get  "remove", :action => :destroy, :as => :remove
+        tc.assert_deprecated do
+          get action: :show, as: :show
+        end
       end
     end
 
@@ -391,6 +394,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     get '/pagemark/remove'
     assert_equal 'pagemarks#destroy', @response.body
     assert_equal '/pagemark/remove', pagemark_remove_path
+
+    get '/pagemark'
+    assert_equal 'pagemarks#show', @response.body
+    assert_equal '/pagemark', pagemark_show_path
   end
 
   def test_admin