Skip to content
Browse files

Fix a bug where symbols and strings were not behaving the same in the…

… router. [#5431 state:resolved]
  • Loading branch information...
1 parent 2fb0cbe commit b4f304b7b68e0b4fd780cc6d0944edefc362669d @josevalim josevalim committed
Showing with 7 additions and 12 deletions.
  1. +4 −9 actionpack/lib/action_dispatch/routing/mapper.rb
  2. +3 −3 actionpack/test/dispatch/routing_test.rb
View
13 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -726,22 +726,17 @@ def match(*args)
path = options.delete(:path)
action = args.first
- if action.is_a?(Symbol)
+ if action && action.to_s =~ /^[\w_]+$/
path = path_for_action(action, path)
- options[:to] ||= action
- options[:as] = name_for_action(action, options[:as])
+ options[:action] ||= action
+ options[:as] = name_for_action(action, options[:as])
with_exclusive_scope do
return super(path, options)
end
elsif resource_method_scope?
path = path_for_custom_action
- if action =~ /^[a-zA-Z][_a-zA-Z0-9]*$/
- options[:action] ||= action
- options[:as] = name_for_action(action, options[:as])
- else
- options[:as] = name_for_action(options[:as]) if options[:as]
- end
+ options[:as] = name_for_action(options[:as]) if options[:as]
args.push(options)
with_exclusive_scope do
View
6 actionpack/test/dispatch/routing_test.rb
@@ -658,7 +658,7 @@ def test_bookmarks
get '/bookmark/remove'
assert_equal 'bookmarks#destroy', @response.body
- assert_equal '/bookmark/remove', bookmark_remove_path
+ assert_equal '/bookmark/remove', remove_bookmark_path
end
end
@@ -1192,7 +1192,7 @@ def test_match_shorthand_with_no_scope
def test_match_shorthand_inside_namespace
with_test_routes do
- assert_equal '/account/shorthand', account_shorthand_path
+ assert_equal '/account/shorthand', shorthand_account_path
get '/account/shorthand'
assert_equal 'account#shorthand', @response.body
end
@@ -1244,7 +1244,7 @@ def test_redirect_with_port
def test_normalize_namespaced_matches
with_test_routes do
- assert_equal '/account/description', account_description_path
+ assert_equal '/account/description', description_account_path
get '/account/description'
assert_equal 'account#description', @response.body

0 comments on commit b4f304b

Please sign in to comment.
Something went wrong with that request. Please try again.