diff options
| author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-10 13:11:15 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-10 13:11:15 -0800 |
| commit | 8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d (patch) | |
| tree | 2acb83debd9772fb0719dbb9ce23c70c5dd953b5 /actionpack/test/template/url_helper_test.rb | |
| parent | 2ecfa817c95f98247d1bd7fb28b208d3f950b43f (diff) | |
| parent | ec5434c3c2631bb47b568eede397c3bd596eeb88 (diff) | |
| download | rails-8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d.tar.gz rails-8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d.tar.bz2 rails-8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/template/url_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/url_helper_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 5c463a4f60..d4b58efe1e 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -451,7 +451,7 @@ class UrlHelperControllerTest < ActionController::TestCase def with_url_helper_routing with_routing do |set| set.draw do |map| - map.show_named_route 'url_helper_controller_test/url_helper/show_named_route', :controller => 'url_helper_controller_test/url_helper', :action => 'show_named_route' + match 'url_helper_controller_test/url_helper/show_named_route', :to => 'url_helper_controller_test/url_helper#show_named_route', :as => :show_named_route end yield end @@ -505,7 +505,7 @@ class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase def with_restful_routing with_routing do |set| set.draw do |map| - map.resources :tasks + resources :tasks end yield end @@ -625,8 +625,8 @@ class PolymorphicControllerTest < ActionController::TestCase def with_restful_routing with_routing do |set| set.draw do |map| - map.resources :workshops do |w| - w.resources :sessions + resources :workshops do + resources :sessions end end yield |