Merge pull request #5751 from rafaelfranca/fix-build

Fix url_for when options is nil

3 files changed, 11 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 30e9e5634b..99abf4c1cf 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -606,7 +606,7 @@ module ActionDispatch
       end
 
       def url_for(options)
-        options = (options || {}).reverse_merge!(default_url_options)
+        options = default_url_options.merge(options || {})
 
         handle_positional_args(options)
 
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index bab501f27c..12ae2456d6 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -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|
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 5b06d94d18..04a431c5c9 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -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