提交 a77de098 编写于 作者: Y Yang Bo

sort_by instead of sort

it is avoid sort errot within different and mixed keys.
used `sort_by` + `block` to list parameter by keys.
keep minimum changes
上级 a05f3e5f
......@@ -39,7 +39,7 @@ def generate(name, options, path_parameters, parameterize = nil)
return [route.format(parameterized_parts), params]
end
message = "No route matches #{Hash[constraints.sort].inspect}"
message = "No route matches #{Hash[constraints.sort_by{|k,v| k.to_s}].inspect}"
message << " missing required keys: #{missing_keys.sort.inspect}" unless missing_keys.empty?
raise ActionController::UrlGenerationError, message
......
......@@ -226,7 +226,7 @@ def raise_generation_error(args)
params = parameterize_args(args) { |missing_key|
missing_keys << missing_key
}
constraints = Hash[@route.requirements.merge(params).sort]
constraints = Hash[@route.requirements.merge(params).sort_by{|k,v| k.to_s}]
message = "No route matches #{constraints.inspect}"
message << " missing required keys: #{missing_keys.sort.inspect}"
......
......@@ -4476,6 +4476,19 @@ def app; APP end
error = assert_raises(ActionController::UrlGenerationError, message){ product_path(id: nil) }
assert_equal message, error.message
end
test "url helpers raise message with mixed parameters when generation fails " do
url, missing = { action: 'show', controller: 'products', id: nil, "id"=>"url-tested"}, [:id]
message = "No route matches #{url.inspect} missing required keys: #{missing.inspect}"
# Optimized url helper
error = assert_raises(ActionController::UrlGenerationError){ product_path(nil, 'id'=>'url-tested') }
assert_equal message, error.message
# Non-optimized url helper
error = assert_raises(ActionController::UrlGenerationError, message){ product_path(id: nil, 'id'=>'url-tested') }
assert_equal message, error.message
end
end
class TestDefaultUrlOptions < ActionDispatch::IntegrationTest
......
......@@ -401,6 +401,33 @@ def test_generate_extra_params
assert_equal({:id => 1, :relative_url_root => nil}, params)
end
def test_generate_missing_keys_no_matches_different_format_keys
path = Path::Pattern.from_string '/:controller/:action/:name'
@router.routes.add_route @app, path, {}, {}, {}
primarty_parameters = {
:id => 1,
:controller => "tasks",
:action => "show",
:relative_url_root => nil
}
redirection_parameters = {
'action'=>'show',
}
missing_key = 'name'
missing_parameters ={
missing_key => "task_1"
}
request_parameters = primarty_parameters.merge(redirection_parameters).merge(missing_parameters)
message = "No route matches #{Hash[request_parameters.sort_by{|k,v|k.to_s}].inspect} missing required keys: #{[missing_key.to_sym].inspect}"
error = assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(
nil, request_parameters, request_parameters)
end
assert_equal message, error.message
end
def test_generate_uses_recall_if_needed
path = Path::Pattern.from_string '/:controller(/:action(/:id))'
@router.routes.add_route @app, path, {}, {}, {}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册