aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Phoenix <evan@phx.io>2015-02-19 15:11:08 -0800
committerEvan Phoenix <evan@phx.io>2015-02-19 15:11:08 -0800
commite002a68a4ec19c1d4278e9b523283f59fbe56be1 (patch)
tree7296224640c3a88cab40f67a0e10ef917c268df6
parent43dae996457caa520e845e038b5a4aa6297c4a17 (diff)
downloadrails-e002a68a4ec19c1d4278e9b523283f59fbe56be1.tar.gz
rails-e002a68a4ec19c1d4278e9b523283f59fbe56be1.tar.bz2
rails-e002a68a4ec19c1d4278e9b523283f59fbe56be1.zip
Make the helpers a required argument
-rw-r--r--actionpack/lib/action_dispatch/routing/routes_proxy.rb4
-rw-r--r--actionview/test/activerecord/polymorphic_routes_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/routes_proxy.rb b/actionpack/lib/action_dispatch/routing/routes_proxy.rb
index 68602e1eb2..040ea04046 100644
--- a/actionpack/lib/action_dispatch/routing/routes_proxy.rb
+++ b/actionpack/lib/action_dispatch/routing/routes_proxy.rb
@@ -8,9 +8,9 @@ module ActionDispatch
attr_accessor :scope, :routes
alias :_routes :routes
- def initialize(routes, scope, helpers=nil)
+ def initialize(routes, scope, helpers)
@routes, @scope = routes, scope
- @helpers = helpers || routes.url_helpers
+ @helpers = helpers
end
def url_options
diff --git a/actionview/test/activerecord/polymorphic_routes_test.rb b/actionview/test/activerecord/polymorphic_routes_test.rb
index 8e1ed2776d..6b51775cf3 100644
--- a/actionview/test/activerecord/polymorphic_routes_test.rb
+++ b/actionview/test/activerecord/polymorphic_routes_test.rb
@@ -113,7 +113,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
def test_passing_routes_proxy
with_namespaced_routes(:blog) do
- proxy = ActionDispatch::Routing::RoutesProxy.new(_routes, self)
+ proxy = ActionDispatch::Routing::RoutesProxy.new(_routes, self, _routes.url_helpers)
@blog_post.save
assert_url "http://example.com/posts/#{@blog_post.id}", [proxy, @blog_post]
end