diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:06 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:12 +0200 |
| commit | 9757bfff9b7fff21697228dd0920d8ea93fae969 (patch) | |
| tree | 2bc0c9acc5f17cb03b111d9448c2e100979bd0e2 /actionpack/test/template/url_helper_test.rb | |
| parent | e20012b64b2063b75cbf1acc57195f0c410987de (diff) | |
| parent | e909afccc996293ec6b7ba2d1c6c078fe807956b (diff) | |
| download | rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.gz rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.bz2 rails-9757bfff9b7fff21697228dd0920d8ea93fae969.zip | |
Merge remote branch 'drogus/remove_deprecated_routes'
This merge removes the deprecated routes mapper from Rails and update its tests.
Diffstat (limited to 'actionpack/test/template/url_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/url_helper_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index b76813c554..db8fd82aeb 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -394,7 +394,7 @@ end class UrlHelperControllerTest < ActionController::TestCase class UrlHelperController < ActionController::Base - test_routes do |map| + test_routes do match 'url_helper_controller_test/url_helper/show/:id', :to => 'url_helper_controller_test/url_helper#show', :as => :show @@ -407,8 +407,7 @@ class UrlHelperControllerTest < ActionController::TestCase :to => 'url_helper_controller_test/url_helper#show_named_route', :as => :show_named_route - map.connect ":controller/:action/:id" - # match "/:controller(/:action(/:id))" + match "/:controller(/:action(/:id))" match 'url_helper_controller_test/url_helper/normalize_recall_params', :to => UrlHelperController.action(:normalize_recall), |