aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-03 21:12:49 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-04 13:52:48 -0700
commit8a09ea6d6dbbd6a1325b3be429d96d9c45c046df (patch)
treecc4282d43f8d6fb7d3d4e1c2160b2b58c2a4e13a /actionmailer
parent7f7480f6fc1e88ce19bee8ac7f6fb2243343495e (diff)
downloadrails-8a09ea6d6dbbd6a1325b3be429d96d9c45c046df.tar.gz
rails-8a09ea6d6dbbd6a1325b3be429d96d9c45c046df.tar.bz2
rails-8a09ea6d6dbbd6a1325b3be429d96d9c45c046df.zip
Avoids deprecation warning running tests
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/old_base/url_test.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
index 6895fb230e..b6496bfe1b 100644
--- a/actionmailer/test/old_base/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -28,7 +28,7 @@ class UrlTestMailer < ActionMailer::Base
end
end
-class ActionMailerUrlTest < Test::Unit::TestCase
+class ActionMailerUrlTest < ActionMailer::TestCase
def encode( text, charset="UTF-8" )
quoted_printable( text, charset )
@@ -57,10 +57,12 @@ class ActionMailerUrlTest < Test::Unit::TestCase
def test_signed_up_with_url
UrlTestMailer.delivery_method = :test
-
- AppRoutes.draw do |map|
- map.connect ':controller/:action/:id'
- map.welcome 'welcome', :controller=>"foo", :action=>"bar"
+
+ assert_deprecated do
+ AppRoutes.draw do |map|
+ map.connect ':controller/:action/:id'
+ map.welcome 'welcome', :controller=>"foo", :action=>"bar"
+ end
end
expected = new_mail