7 files changed, 22 insertions, 34 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index cbf3628950..15d482bf2c 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com]
+
 * Resolve action naming collision. #5520 [ssinghi@kreeti.com]
 
 * ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.]
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 81f240e035..a67072a953 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -191,7 +191,7 @@ module ActionMailer #:nodoc:
     
     private_class_method :new #:nodoc:
 
-    cattr_accessor :template_root
+    class_inheritable_accessor :template_root
     cattr_accessor :logger
 
     @@server_settings = { 
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index bf5bf7f3ac..19f3707db8 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -1,8 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
-
-require 'test/unit'
-require 'action_mailer'
+require "#{File.dirname(__FILE__)}/abstract_unit"
 
 module MailerHelper
   def person_name
@@ -56,8 +52,6 @@ class HelperMailer < ActionMailer::Base
     helper_method :name_of_the_mailer_class
 end
 
-HelperMailer.template_root = File.dirname(__FILE__) + "/fixtures"
-
 class MailerHelperTest < Test::Unit::TestCase
   def new_mail( charset="utf-8" )
     mail = TMail::Mail.new
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb
index 11ac4d1ed8..42454fef6e 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/mail_render_test.rb
@@ -1,7 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-
-require 'test/unit'
-require 'action_mailer'
+require "#{File.dirname(__FILE__)}/abstract_unit"
 
 class RenderMailer < ActionMailer::Base
   def inline_template(recipient)
@@ -40,8 +37,6 @@ class SecondMailer < ActionMailer::Base
   end
 end
 
-RenderMailer.template_root = File.dirname(__FILE__) + "/fixtures"
-
 class RenderHelperTest < Test::Unit::TestCase
   def setup
     ActionMailer::Base.delivery_method = :test
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
diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb
index 6291cd3db6..0b145b1f77 100644
--- a/actionmailer/test/quoting_test.rb
+++ b/actionmailer/test/quoting_test.rb
@@ -1,7 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-$:.unshift(File.dirname(__FILE__) + "/../lib/action_mailer/vendor")
-
-require 'test/unit'
+require "#{File.dirname(__FILE__)}/abstract_unit"
 require 'tmail'
 require 'tempfile'
 
diff --git a/actionmailer/test/tmail_test.rb b/actionmailer/test/tmail_test.rb
index 3930c7d39a..7d83a68ac7 100644
--- a/actionmailer/test/tmail_test.rb
+++ b/actionmailer/test/tmail_test.rb
@@ -1,8 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-$:.unshift File.dirname(__FILE__) + "/fixtures/helpers"
-
-require 'test/unit'
-require 'action_mailer'
+require "#{File.dirname(__FILE__)}/abstract_unit"
 
 class TMailMailTest < Test::Unit::TestCase
   def test_body