mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make url_for work when option is nil and default_url_options has
stringified keys
This commit is contained in:
parent
8f4cf26d69
commit
ddbd1e4adb
2 changed files with 10 additions and 1 deletions
|
@ -145,7 +145,7 @@ module ActionDispatch
|
|||
def url_for(options = nil)
|
||||
case options
|
||||
when nil
|
||||
_routes.url_for(url_options)
|
||||
_routes.url_for(url_options.symbolize_keys)
|
||||
when Hash
|
||||
symbolized = {}
|
||||
options.keys.each do |k|
|
||||
|
|
|
@ -365,6 +365,15 @@ module AbstractController
|
|||
assert_equal("/c/a", W.new.url_for(:controller => 'c', :action => 'a', :only_path => true))
|
||||
end
|
||||
|
||||
def test_with_stringified_default_url_options_and_without_options
|
||||
W.default_url_options['controller'] = 'c'
|
||||
W.default_url_options['only_path'] = true
|
||||
assert_equal("/c", W.new.url_for)
|
||||
|
||||
W.default_url_options['action'] = 'a'
|
||||
assert_equal("/c/a", W.new.url_for)
|
||||
end
|
||||
|
||||
def test_url_params_with_nil_to_param_are_not_in_url
|
||||
assert_equal("/c/a", W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :id => Struct.new(:to_param).new(nil)))
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue