diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
commit | a08004a9a7d4c93c39f9693f6406ecb70d6a38c0 (patch) | |
tree | 531584bf588a3b288ab14a8e16540ab947a0ec45 /actionpack/test/controller/base_test.rb | |
parent | c26d10563eaa29961ae895a9fbe3afae7d24a9b1 (diff) | |
parent | 04f52219f11944e50555dc59917c73c99581dac0 (diff) | |
download | rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.gz rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.bz2 rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/base_test.rb')
-rw-r--r-- | actionpack/test/controller/base_test.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 8416754c1e..b28717597e 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -52,7 +52,7 @@ class DefaultUrlOptionsController < ActionController::Base def default_url_options_action end - def default_url_options(options) + def default_url_options(options = nil) { :host => 'www.override.com', :action => 'new', :bacon => 'chunky' } end end @@ -167,4 +167,17 @@ class DefaultUrlOptionsTest < Test::Unit::TestCase ensure ActionController::Routing::Routes.load! end +end + +class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase + def test_named_routes_still_work + ActionController::Routing::Routes.draw do |map| + map.resources :things + end + EmptyController.send :include, ActionController::UrlWriter + + assert_equal '/things', EmptyController.new.send(:things_path) + ensure + ActionController::Routing::Routes.load! + end end
\ No newline at end of file |