aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-02-22 23:52:02 +0100
committerPratik Naik <pratiknaik@gmail.com>2009-02-22 23:52:02 +0100
commit21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd (patch)
treebfec5946303ceb582674904c5f9927e9b4020272 /actionmailer/test
parent91ab75373f13054485f5d804d7e2c80d466ff5e0 (diff)
parent441e4e22352c8805a882f6a661ab3982dd7eda12 (diff)
downloadrails-21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd.tar.gz
rails-21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd.tar.bz2
rails-21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/mail_service_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 0934d3537f..1e04531753 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -975,7 +975,7 @@ end
class InheritableTemplateRootTest < Test::Unit::TestCase
def test_attr
- expected = ("#{File.dirname(__FILE__)}/fixtures/path.with.dots").sub(/\.\//, '')
+ expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
assert_equal expected, FunkyPathMailer.template_root.to_s
sub = Class.new(FunkyPathMailer)