Fix singleton resource named routes

2 files changed, 5 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 9b8660d22b..ce5c56ae1c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -448,8 +448,8 @@ module ActionDispatch
               post   :create if resource.actions.include?(:create)
               put    :update if resource.actions.include?(:update)
               delete :destroy if resource.actions.include?(:destroy)
-              get    :new, :as => "new_#{resource.singular}" if resource.actions.include?(:new)
-              get    :edit, :as => "edit_#{resource.singular}" if resource.actions.include?(:edit)
+              get    :new, :as => resource.singular if resource.actions.include?(:new)
+              get    :edit, :as => resource.singular if resource.actions.include?(:edit)
             end
           end
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 23581c8a17..890895a330 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -207,6 +207,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/session'
       assert_equal 'sessions#create', @response.body
+      assert_equal '/session', session_path
 
       post '/session'
       assert_equal 'sessions#create', @response.body
@@ -219,9 +220,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/session/new'
       assert_equal 'sessions#new', @response.body
+      assert_equal '/session/new', new_session_path
 
       get '/session/edit'
       assert_equal 'sessions#edit', @response.body
+      assert_equal '/session/edit', edit_session_path
     end
   end