diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-08 20:10:14 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-08 20:10:14 -0700 |
| commit | 4c1dcb05373f667be90a69bfb2b642efe75e9d18 (patch) | |
| tree | e0a57a91ae750babcc503184c9dfdad052ca7596 /actionpack | |
| parent | 500c9a161c10e95b8d3c8a63a57da673ddf3da3c (diff) | |
| parent | c9945b3f0a85949f8b9fa1218a868a988e6c4fa6 (diff) | |
| download | rails-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')
| -rw-r--r-- | actionpack/test/controller/base_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/url_helper_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 2d4083252e..2032aca52e 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -45,7 +45,7 @@ class DefaultUrlOptionsController < ActionController::Base render :inline => "<%= #{params[:route]} %>" end - def default_url_options(options = nil) + def default_url_options { :host => 'www.override.com', :action => 'new', :locale => 'en' } end end 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 |