aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/mail_service_test.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-04-27 12:34:25 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-04-27 12:34:25 -0700
commitab83db9d069dea643eeb3588eeee634a780b6735 (patch)
treeb88a52903ff5e3fefe2a813c21d8da3f36403013 /actionmailer/test/mail_service_test.rb
parentcecafc52ee0a4a53c903ddbaba95683261f88e5f (diff)
downloadrails-ab83db9d069dea643eeb3588eeee634a780b6735.tar.gz
rails-ab83db9d069dea643eeb3588eeee634a780b6735.tar.bz2
rails-ab83db9d069dea643eeb3588eeee634a780b6735.zip
Fixes ActionMailer to work with the ActionView refactoring
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
-rw-r--r--actionmailer/test/mail_service_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index b27bda49be..919ab5de94 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -994,13 +994,13 @@ end
class InheritableTemplateRootTest < Test::Unit::TestCase
def test_attr
- expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
+ 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_equal 'test/path', sub.template_root.to_s
+ assert_equal File.expand_path('test/path'), sub.template_root.to_s
assert_equal expected, FunkyPathMailer.template_root.to_s
end
end