aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-04-08 20:10:14 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-04-08 20:10:14 -0700
commit4c1dcb05373f667be90a69bfb2b642efe75e9d18 (patch)
treee0a57a91ae750babcc503184c9dfdad052ca7596 /actionpack/test/template
parent500c9a161c10e95b8d3c8a63a57da673ddf3da3c (diff)
parentc9945b3f0a85949f8b9fa1218a868a988e6c4fa6 (diff)
downloadrails-4c1dcb05373f667be90a69bfb2b642efe75e9d18.tar.gz
rails-4c1dcb05373f667be90a69bfb2b642efe75e9d18.tar.bz2
rails-4c1dcb05373f667be90a69bfb2b642efe75e9d18.zip
Merge pull request #5783 from rafaelfranca/default_url_options
Document that default_url_options must return a hash with symbolized keys
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/url_helper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index a93a1b816f..88f506b217 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -566,7 +566,7 @@ class UrlHelperControllerTest < ActionController::TestCase
def test_named_route_should_show_host_and_path_using_controller_default_url_options
class << @controller
- def default_url_options(options = nil)
+ def default_url_options
{:host => 'testtwo.host'}
end
end