Fix incorrect output from rails routes when using singular resources issue #26606

Rails routes (even rake routes in previous versions) output showed incorrect routes when an application use resource :controller, implying that edit_controller_path match with controller#show.
The order of the output has changed to correct this. View #26606 for more information.

Added a test case, change unit test in rake to expect the new output.
Since the output of resource :controller is changing, the string spected of the railties/test/application/rake_test.rb test_rails_routes_with_controller_environment had to be modified.

2 files changed, 15 insertions, 9 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index f477d18c6a..9b6dcd7af3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,11 +1,17 @@
-*   Fixes multiple calls to `logger.fatal` instead of a single call, 
-    for every line in an exception backtrace, when printing trace 
+*   Fixes Incorrect output from rails routes when using singular resources.
+
+    Fixes #26606
+
+    *Erick Reyna*
+    
+*   Fixes multiple calls to `logger.fatal` instead of a single call,
+    for every line in an exception backtrace, when printing trace
     from `DebugExceptions` middleware.
-      
+
     Fixes #26134  
 
     *Vipul A M*
-   
+
 *   Add support for arbitrary hashes in strong parameters:
 
     ```ruby
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index b39d367f7f..4efde09b8b 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1244,11 +1244,11 @@ module ActionDispatch
         # the plural):
         #
         #   GET       /profile/new
-        #   POST      /profile
         #   GET       /profile
         #   GET       /profile/edit
         #   PATCH/PUT /profile
         #   DELETE    /profile
+        #   POST      /profile
         #
         # === Options
         # Takes same options as +resources+.
@@ -1266,15 +1266,15 @@ module ActionDispatch
 
               concerns(options[:concerns]) if options[:concerns]
 
-              collection do
-                post :create
-              end if parent_resource.actions.include?(:create)
-
               new do
                 get :new
               end if parent_resource.actions.include?(:new)
 
               set_member_mappings_for_resource
+
+              collection do
+                post :create
+              end if parent_resource.actions.include?(:create)
             end
           end