TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make ActionDispatch url_for use HWIA symbolize_keys

Browse Source 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Santiago Pastorino 2010-04-22 12:33:54 -03:00 committed by Jeremy Kemper
parent 2472f1026a
commit 920df0a475
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/routing/url_for.rb
View File

@ -128,7 +128,7 @@ def url_for(options = nil)
when String
options
when nil, Hash
_router.url_for(url_options.merge(options || {}).symbolize_keys)
_router.url_for(url_options.merge((options || {}).symbolize_keys))
else
polymorphic_url(options)
end

10
actionpack/test/controller/url_for_test.rb
View File

@ -258,13 +258,17 @@ def test_multiple_includes_maintain_distinct_options
end
def test_with_stringified_keys
assert_equal("/c/a", W.new.url_for('controller' => 'c', 'action' => 'a', 'only_path' => true))
assert_equal("/c", W.new.url_for('controller' => 'c', 'only_path' => true))
assert_equal("/c/a", W.new.url_for('controller' => 'c', 'action' => 'a', 'only_path' => true))
end
def test_with_hash_with_indifferent_access
assert_equal("/c/a", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true)))
W.default_url_options[:controller] = 'd'
W.default_url_options[:only_path] = false
assert_equal("/c", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'only_path' => true)))
W.default_url_options[:action] = 'b'
assert_equal("/c/a", W.new.url_for(HashWithIndifferentAccess.new('controller' => 'c', 'action' => 'a', 'only_path' => true)))
end
private
@ -273,4 +277,4 @@ def extract_params(url)
end
end
end
end
end