diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
| commit | 9b98362cda013f85406ae8b26922264d382794dd (patch) | |
| tree | 9842eeee02a1e2b571e0008b18c5a8b390256224 /actionmailer/test | |
| parent | ea12819adf5d5fa1e8ae07789478e18db887cda1 (diff) | |
| parent | 69387ce0169b95d3a170cfb1c66a7570b1746e37 (diff) | |
| download | rails-9b98362cda013f85406ae8b26922264d382794dd.tar.gz rails-9b98362cda013f85406ae8b26922264d382794dd.tar.bz2 rails-9b98362cda013f85406ae8b26922264d382794dd.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/activerecord_validations_callbacks.html
railties/doc/guides/source/activerecord_validations_callbacks.txt
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/mail_service_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index e469302fe1..15a40552c9 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -967,13 +967,13 @@ end # uses_mocha class InheritableTemplateRootTest < Test::Unit::TestCase def test_attr expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots" - assert_equal expected, FunkyPathMailer.template_root + assert_equal expected, FunkyPathMailer.template_root.to_s sub = Class.new(FunkyPathMailer) sub.template_root = 'test/path' - assert_equal 'test/path', sub.template_root - assert_equal expected, FunkyPathMailer.template_root + assert_equal 'test/path', sub.template_root.to_s + assert_equal expected, FunkyPathMailer.template_root.to_s end end |