Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Dynamically generaeted helpers on collection should not clobber resou…

…rces url helper [#6028 state:resolved]
  • Loading branch information...
commit 731ca00b484379661786fac36c17db7e085603c4 1 parent 90b0f61
@josevalim josevalim authored
View
2  actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1299,6 +1299,8 @@ def name_for_action(as, action) #:nodoc:
name_prefix = @scope[:as]
if parent_resource
+ return nil if as.nil? && action.nil?
+
collection_name = parent_resource.collection_name
member_name = parent_resource.member_name
end
View
11 actionpack/test/dispatch/routing_test.rb
@@ -155,6 +155,11 @@ def self.matches?(request)
end
resources :replies do
+ collection do
+ get 'page/:page' => 'replies#index', :page => %r{\d+}
+ get ':page' => 'replies#index', :page => %r{\d+}
+ end
+
new do
post :preview
end
@@ -1241,6 +1246,12 @@ def test_match_shorthand_inside_namespace
end
end
+ def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper
+ with_test_routes do
+ assert_equal '/replies', replies_path
+ end
+ end
+
def test_scoped_controller_with_namespace_and_action
with_test_routes do
assert_equal '/account/twitter/callback', account_callback_path("twitter")
Please sign in to comment.
Something went wrong with that request. Please try again.