aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-09-04 13:36:35 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-05 13:44:38 +0200
commitb7bfeaa9fc7eaf315ce8eaae129fd0d02c9d09d0 (patch)
tree1c0a0bad2bbe336a8f85c4d9b6e69181d8adc824 /actionmailer
parentca3936dbd691538d97d8dbe2bc1d64c21dc7db0e (diff)
downloadrails-b7bfeaa9fc7eaf315ce8eaae129fd0d02c9d09d0.tar.gz
rails-b7bfeaa9fc7eaf315ce8eaae129fd0d02c9d09d0.tar.bz2
rails-b7bfeaa9fc7eaf315ce8eaae129fd0d02c9d09d0.zip
Fix action mailer tests after old mapper removal
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/url_test.rb8
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