Fix how routes inside namespaces are generated.
This commit is contained in:
parent
4df19b3f27
commit
2916521da8
@ -726,7 +726,7 @@ def match(*args)
|
||||
path = options.delete(:path)
|
||||
action = args.first
|
||||
|
||||
if action && action.to_s =~ /^[A-Za-z_]\w*$/
|
||||
if action.is_a?(Symbol) || (resource_method_scope? && action.to_s =~ /^[A-Za-z_]\w*$/)
|
||||
path = path_for_action(action, path)
|
||||
options[:action] ||= action
|
||||
options[:as] = name_for_action(action, options[:as])
|
||||
|
@ -660,7 +660,7 @@ def test_bookmarks
|
||||
|
||||
get '/bookmark/remove'
|
||||
assert_equal 'bookmarks#destroy', @response.body
|
||||
assert_equal '/bookmark/remove', remove_bookmark_path
|
||||
assert_equal '/bookmark/remove', bookmark_remove_path
|
||||
end
|
||||
end
|
||||
|
||||
@ -1195,7 +1195,7 @@ def test_match_shorthand_with_no_scope
|
||||
|
||||
def test_match_shorthand_inside_namespace
|
||||
with_test_routes do
|
||||
assert_equal '/account/shorthand', shorthand_account_path
|
||||
assert_equal '/account/shorthand', account_shorthand_path
|
||||
get '/account/shorthand'
|
||||
assert_equal 'account#shorthand', @response.body
|
||||
end
|
||||
@ -1247,7 +1247,7 @@ def test_redirect_with_port
|
||||
|
||||
def test_normalize_namespaced_matches
|
||||
with_test_routes do
|
||||
assert_equal '/account/description', description_account_path
|
||||
assert_equal '/account/description', account_description_path
|
||||
|
||||
get '/account/description'
|
||||
assert_equal 'account#description', @response.body
|
||||
|
Loading…
Reference in New Issue
Block a user