From 5446ecd5b975890dab5f7120b25ed0e8f91279fa Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 30 Jun 2006 05:27:05 +0000 Subject: Mailer template root applies to a class and its subclasses rather than acting globally. Closes #5555. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4523 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/test/mail_service_test.rb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'actionmailer/test/mail_service_test.rb') diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index aa9002a262..bcce81e3aa 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -1,7 +1,4 @@ -$:.unshift(File.dirname(__FILE__) + "/../lib/") - -require 'test/unit' -require 'action_mailer' +require "#{File.dirname(__FILE__)}/abstract_unit" class MockSMTP def self.deliveries @@ -24,6 +21,8 @@ class Net::SMTP end class FunkyPathMailer < ActionMailer::Base + self.template_root = "#{File.dirname(__FILE__)}/fixtures/path.with.dots" + def multipart_with_template_path_with_dots(recipient) recipients recipient subject "Have a lovely picture" @@ -31,14 +30,9 @@ class FunkyPathMailer < ActionMailer::Base attachment :content_type => "image/jpeg", :body => "not really a jpeg, we're only testing, after all" end - - def template_root - "#{File.dirname(__FILE__)}/fixtures/path.with.dots" - end end class TestMailer < ActionMailer::Base - def signed_up(recipient) @recipients = recipient @subject = "[Signed up] Welcome #{recipient}" @@ -271,8 +265,6 @@ class TestMailer < ActionMailer::Base end end -TestMailer.template_root = File.dirname(__FILE__) + "/fixtures" - class ActionMailerTest < Test::Unit::TestCase include ActionMailer::Quoting @@ -816,3 +808,15 @@ EOF end end +class InheritableTemplateRootTest < Test::Unit::TestCase + def test_attr + expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots" + assert_equal expected, FunkyPathMailer.template_root + + sub = Class.new(FunkyPathMailer) + sub.template_root = 'test/path' + + assert_equal 'test/path', sub.template_root + assert_equal expected, FunkyPathMailer.template_root + end +end -- cgit v1.2.3