aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/base_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-08 16:52:26 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-08 16:52:26 -0600
commit2be5e088d27f17cd7210cbfd227aff2e5be6b800 (patch)
treecfd72dedbc45de1f0e143bc08bf196937c4f31c2 /actionpack/test/controller/base_test.rb
parentac711043ecec0dd15a159eff8081be8f10584be0 (diff)
downloadrails-2be5e088d27f17cd7210cbfd227aff2e5be6b800.tar.gz
rails-2be5e088d27f17cd7210cbfd227aff2e5be6b800.tar.bz2
rails-2be5e088d27f17cd7210cbfd227aff2e5be6b800.zip
Use new routing dsl in tests
Diffstat (limited to 'actionpack/test/controller/base_test.rb')
-rw-r--r--actionpack/test/controller/base_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index b57550a69a..8f8ada8d8c 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -179,8 +179,8 @@ class DefaultUrlOptionsTest < ActionController::TestCase
def test_default_url_options_are_used_if_set
with_routing do |set|
set.draw do |map|
- map.default_url_options 'default_url_options', :controller => 'default_url_options'
- map.connect ':controller/:action/:id'
+ match 'default_url_options', :to => 'default_url_options#default_url_options_action', :as => :default_url_options
+ match ':controller/:action'
end
get :default_url_options_action # Make a dummy request so that the controller is initialized properly.
@@ -210,7 +210,7 @@ class EnsureNamedRoutesWorksTicket22BugTest < ActionController::TestCase
def test_named_routes_still_work
with_routing do |set|
set.draw do |map|
- map.resources :things
+ resources :things
end
EmptyController.send :include, ActionController::UrlWriter