Use new ActiveModel::Naming.route_key in polymorphic_routes

2 files changed, 3 insertions, 12 deletions

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index ecc1651dfe..02ba5236ee 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -177,8 +177,7 @@ module ActionDispatch
               if parent.is_a?(Symbol) || parent.is_a?(String)
                 parent
               else
-                str = ActiveModel::Naming.plural(parent).singularize
-                remove_namespace(str, parent)
+                ActiveModel::Naming.route_key(parent).singularize
               end
             end
           end
@@ -186,8 +185,7 @@ module ActionDispatch
           if record.is_a?(Symbol) || record.is_a?(String)
             route << record
           else
-            route << ActiveModel::Naming.plural(record)
-            remove_namespace(route, record)
+            route << ActiveModel::Naming.route_key(record)
             route = [route.join("_").singularize] if inflection == :singular
             route << "index" if ActiveModel::Naming.uncountable?(record) && inflection == :plural
           end
@@ -197,13 +195,6 @@ module ActionDispatch
           action_prefix(options) + route.join("_")
         end
 
-        def remove_namespace(string, parent)
-          if namespace = parent.class.parents.detect { |n| n.respond_to?(:_railtie) }
-            string.sub!(/#{namespace._railtie.railtie_name}_/, '')
-          end
-          string
-        end
-
         def extract_record(record_or_hash_or_array)
           case record_or_hash_or_array
             when Array; record_or_hash_or_array.last
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 23c9fb839e..448aaa5eee 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -436,7 +436,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
   def with_namespaced_routes(name)
     with_routing do |set|
       set.draw do
-        namespace(name, :shallow_path => nil, :path => nil, :as => nil) do
+        scope(:module => name) do
           resources :blogs do
             resources :posts
           end