Merge branch 'master' of github.com:rails/rails

1 files changed, 15 insertions, 1 deletions

diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index fc7773dffe..907acf9573 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -257,10 +257,24 @@ module AbstractController
         assert_equal second_class.default_url_options[:host], second_host
       end
 
+      def test_with_stringified_keys
+        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
+        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
         def extract_params(url)
           url.split('?', 2).last.split('&').sort
         end
     end
   end
-end
\ No newline at end of file
+end