From 4c8af9bf518582cce73b4b430989dc6cd8cdd775 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 13 Apr 2010 12:14:54 -0700 Subject: Update changelogs for release --- actionmailer/CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) (limited to 'actionmailer') diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index c1b659a9f5..383ad2105d 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,7 +1,10 @@ +*Rails 3.0.0 [beta 3] (April 13th, 2010)* + * Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML] * Lot of updates to various test cases that now work better with the new Mail and so have different expectations + *Rails 3.0.0 [beta 2] (April 1st, 2010)* * Added interceptors and observers from Mail [ML] -- cgit v1.2.3 From b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 13 Apr 2010 23:04:22 +0200 Subject: template_name and template_path should not be added to mail headers. --- actionmailer/lib/action_mailer/base.rb | 2 +- actionmailer/test/base_test.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 9c0f5d0ac3..d827ccdf2b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -541,7 +541,7 @@ module ActionMailer #:nodoc: wrap_delivery_behavior!(headers.delete(:delivery_method)) # Assign all headers except parts_order, content_type and body - assignable = headers.except(:parts_order, :content_type, :body) + assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) assignable.each { |k, v| m[k] = v } # Render the templates and blocks diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index baeee542be..8e69073009 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -510,28 +510,28 @@ class BaseTest < ActiveSupport::TestCase # Rendering test "you can specify a different template for implicit render" do - mail = BaseMailer.implicit_different_template('implicit_multipart') + mail = BaseMailer.implicit_different_template('implicit_multipart').deliver assert_equal("HTML Implicit Multipart", mail.html_part.body.decoded) assert_equal("TEXT Implicit Multipart", mail.text_part.body.decoded) end test "you can specify a different template for explicit render" do - mail = BaseMailer.explicit_different_template('explicit_multipart_templates') + mail = BaseMailer.explicit_different_template('explicit_multipart_templates').deliver assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded) assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded) end test "you can specify a different layout" do - mail = BaseMailer.different_layout('different_layout') + mail = BaseMailer.different_layout('different_layout').deliver assert_equal("HTML -- HTML", mail.html_part.body.decoded) assert_equal("PLAIN -- PLAIN", mail.text_part.body.decoded) end test "you can specify the template path for implicit lookup" do - mail = BaseMailer.welcome_from_another_path('another.path/base_mailer') + mail = BaseMailer.welcome_from_another_path('another.path/base_mailer').deliver assert_equal("Welcome from another path", mail.body.encoded) - mail = BaseMailer.welcome_from_another_path(['unknown/invalid', 'another.path/base_mailer']) + mail = BaseMailer.welcome_from_another_path(['unknown/invalid', 'another.path/base_mailer']).deliver assert_equal("Welcome from another path", mail.body.encoded) end -- cgit v1.2.3