diff options
Diffstat (limited to 'actionmailer')
-rwxr-xr-x | actionmailer/Rakefile | 4 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 | ||||
-rwxr-xr-x | actionmailer/test/mail_service_test.rb | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index c09526cbef..b003f4d559 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -76,12 +76,12 @@ end desc "Publish the API documentation" task :pgem => [:package] do - Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload + Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload end desc "Publish the API documentation" task :pdoc => [:rdoc] do - Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/am", "doc").upload + Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/am", "doc").upload end desc "Publish the release files to RubyForge." diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 51fc6032cc..1518e23dfe 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -426,8 +426,7 @@ module ActionMailer #:nodoc: end def template_root=(root) - write_inheritable_attribute(:template_root, root) - ActionView::TemplateFinder.process_view_paths(root) + write_inheritable_attribute(:template_root, ActionView::ViewLoadPaths.new(Array(root))) end end @@ -547,7 +546,7 @@ module ActionMailer #:nodoc: end def initialize_template_class(assigns) - ActionView::Base.new([template_root], assigns, self) + ActionView::Base.new(template_root, assigns, self) end def sort_parts(parts, order = []) diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index e5ecb0e254..7f4a8817ca 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -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 + assert_equal [expected], FunkyPathMailer.template_root.map(&: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.map(&:to_s) + assert_equal [expected], FunkyPathMailer.template_root.map(&:to_s) end end |