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 /actionmailer/test | |
| 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 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/url_test.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb index 9b2b38d9e8..0536e83098 100644 --- a/actionmailer/test/url_test.rb +++ b/actionmailer/test/url_test.rb @@ -56,11 +56,9 @@ class ActionMailerUrlTest < ActionMailer::TestCase def test_signed_up_with_url UrlTestMailer.delivery_method = :test - assert_deprecated do - AppRoutes.draw do |map| - map.connect ':controller/:action/:id' - map.welcome 'welcome', :controller=>"foo", :action=>"bar" - end + AppRoutes.draw do + match ':controller(/:action(/:id))' + match '/welcome' => "foo#bar", :as => "welcome" end expected = new_mail |