Make polymorphic_url calls go through application helpers again.

This brings back the ability to overwrite/extend url generating methods in application heleprs.

3 files changed, 14 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 49aef0bf72..e989a38d8b 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -124,14 +124,7 @@ module ActionDispatch
           args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
         end
 
-        if proxy
-          proxy.send(named_route, *args)
-        else
-          # we need to use url_for, because polymorphic_url can be used in context of other than
-          # current routes (e.g. engine's routes). As named routes from engine are not included
-          # calling engine's named route directly would fail.
-          url_for _routes.url_helpers.__send__("hash_for_#{named_route}", *args)
-        end
+        (proxy || self).send(named_route, *args)
       end
 
       # Returns the path component of a URL for the given record. It uses
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index b28a058250..93eccaecbd 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -50,7 +50,9 @@ module TestGenerationPrefix
             scope "/:omg", :omg => "awesome" do
               mount BlogEngine => "/blog", :as => "blog_engine"
             end
+            match "/posts/:id", :to => "outside_engine_generating#post", :as => :post
             match "/generate", :to => "outside_engine_generating#index"
+            match "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
             match "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
             match "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
             match "/conflicting_url", :to => "outside_engine_generating#conflicting"
@@ -101,6 +103,7 @@ module TestGenerationPrefix
 
     class ::OutsideEngineGeneratingController < ActionController::Base
       include BlogEngine.routes.mounted_helpers
+      include RailsApplication.routes.url_helpers
 
       def index
         render :text => blog_engine.post_path(:id => 1)
@@ -110,6 +113,10 @@ module TestGenerationPrefix
         render :text => blog_engine.polymorphic_path(Post.new)
       end
 
+      def polymorphic_path_for_app
+        render :text => polymorphic_path(Post.new)
+      end
+
       def polymorphic_with_url_for
         render :text => blog_engine.url_for(Post.new)
       end
@@ -201,6 +208,11 @@ module TestGenerationPrefix
       assert_equal "/awesome/blog/posts/1", last_response.body
     end
 
+    test "polymorphic_path_for_app" do
+      get "/polymorphic_path_for_app"
+      assert_equal "/posts/1", last_response.body
+    end
+
     test "[APP] generating engine's url with url_for(@post)" do
       get "/polymorphic_with_url_for"
       assert_equal "http://example.org/awesome/blog/posts/1", last_response.body
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index 3d0bbba435..bf789cd8b7 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -39,7 +39,7 @@ class PeopleHelperTest < ActionView::TestCase
     with_test_route_set do
       person = mock(:name => "David")
       person.class.extend ActiveModel::Naming
-      _routes.url_helpers.expects(:hash_for_mocha_mock_path).with(person).returns("/people/1")
+      expects(:mocha_mock_path).with(person).returns("/people/1")
       assert_equal '<a href="/people/1">David</a>', link_to_person(person)
     end
   end