github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-27 07:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only create a path for ActionMailer template root instead of a path set. Better fix than 7461227

Browse Source
This commit is contained in:
Joshua Peek
2008-07-19 12:35:42 -05:00
parent 7461227352
commit e23156e87b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actionmailer/lib/action_mailer/base.rb
View File

@@ -426,7 +426,7 @@ module ActionMailer #:nodoc:
end
def template_root=(root)
write_inheritable_attribute(:template_root, ActionView::PathSet.new(Array(root)))
write_inheritable_attribute(:template_root, ActionView::PathSet::Path.new(root))
end
end
@@ -541,7 +541,7 @@ module ActionMailer #:nodoc:
end
def template_path
"#{template_root.join}/#{mailer_name}"
"#{template_root}/#{mailer_name}"
end
def initialize_template_class(assigns)

6
actionmailer/test/mail_service_test.rb
View File

@@ -942,13 +942,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.map(&:to_s)
assert_equal expected, FunkyPathMailer.template_root
sub = Class.new(FunkyPathMailer)
sub.template_root = 'test/path'
assert_equal ['test/path'], sub.template_root.map(&:to_s)
assert_equal [expected], FunkyPathMailer.template_root.map(&:to_s)
assert_equal 'test/path', sub.template_root
assert_equal expected, FunkyPathMailer.template_root
end
end