Transform dashes to underscores in resource route names

Fixes #13824

2 files changed, 17 insertions, 7 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 6a4d7c3afa..d5eb770cb1 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1442,7 +1442,7 @@ module ActionDispatch
           action = action.to_s.dup
 
           if action =~ /^[\w\-\/]+$/
-            options[:action] ||= action unless action.include?("/")
+            options[:action] ||= action.tr('-', '_') unless action.include?("/")
           else
             action = nil
           end
@@ -1607,10 +1607,11 @@ module ActionDispatch
 
           def prefix_name_for_action(as, action) #:nodoc:
             if as
-              as.to_s
+              prefix = as
             elsif !canonical_action?(action, @scope[:scope_level])
-              action.to_s
+              prefix = action
             end
+            prefix.to_s.tr('-', '_') if prefix
           end
 
           def name_for_action(as, action) #:nodoc:
@@ -1637,7 +1638,6 @@ module ActionDispatch
             when :root
               [name_prefix, collection_name, prefix]
             else
-              prefix.gsub!(/\-/, '_') if prefix.is_a?(String)
               [name_prefix, member_name, prefix]
             end
 
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 74515e3f57..ff33dd5652 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -185,12 +185,22 @@ module ActionDispatch
         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"
+          "               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