aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-04-08 23:42:02 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-04-08 23:44:00 -0300
commit9efe01ef0d332239f37a211e2351f107de5d235b (patch)
tree7fe6723bb0513b83f6cbc651a25d3ae10a278376 /actionpack/test
parent9f37f335f23b7e4407161d501e5f7d508e3ab7ec (diff)
downloadrails-9efe01ef0d332239f37a211e2351f107de5d235b.tar.gz
rails-9efe01ef0d332239f37a211e2351f107de5d235b.tar.bz2
rails-9efe01ef0d332239f37a211e2351f107de5d235b.zip
default_url_options does not receive one argument anymore
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/base_test.rb2
-rw-r--r--actionpack/test/template/url_helper_test.rb2
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