aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-24 18:40:04 +0100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-24 18:40:04 +0100
commit99f960a3d73b62a957988bbee0906264f35afc2e (patch)
treea8fd0506d83bbc37428972577d8c887ea3f50a3f /actionmailer/test
parent0d931fecbb1132abb71a83bb91435812f2012d0e (diff)
downloadrails-99f960a3d73b62a957988bbee0906264f35afc2e.tar.gz
rails-99f960a3d73b62a957988bbee0906264f35afc2e.tar.bz2
rails-99f960a3d73b62a957988bbee0906264f35afc2e.zip
Handle some TODOs and deprecations.
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/mail_service_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index c0a3f655b9..aa31c9a803 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -1085,13 +1085,15 @@ EOF
end
end
-class InheritableTemplateRootTest < Test::Unit::TestCase
+class InheritableTemplateRootTest < ActiveSupport::TestCase
def test_attr
expected = File.expand_path("#{File.dirname(__FILE__)}/fixtures/path.with.dots")
assert_equal expected, FunkyPathMailer.template_root.to_s
sub = Class.new(FunkyPathMailer)
- sub.template_root = 'test/path'
+ assert_deprecated do
+ sub.template_root = 'test/path'
+ end
assert_equal File.expand_path('test/path'), sub.template_root.to_s
assert_equal expected, FunkyPathMailer.template_root.to_s