Skip to content
Browse files

Merge pull request #5751 from rafaelfranca/fix-build

Fix url_for when options is nil
  • Loading branch information...
2 parents ca879d2 + ddbd1e4 commit e535faaee7bf0c01102ef29d2d396063604ab9d9 @fxn fxn committed
View
2 actionpack/lib/action_dispatch/routing/route_set.rb
@@ -606,7 +606,7 @@ def _generate_prefix(options = {})
end
def url_for(options)
- options = (options || {}).reverse_merge!(default_url_options)
+ options = default_url_options.merge(options || {})
handle_positional_args(options)
View
2 actionpack/lib/action_dispatch/routing/url_for.rb
@@ -145,7 +145,7 @@ def url_options
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|
View
9 actionpack/test/controller/url_for_test.rb
@@ -365,6 +365,15 @@ def test_with_stringified_default_url_options
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

0 comments on commit e535faa

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