From 1024c11f3c6218dfdbe8ac4be41671248c21591c Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Fri, 29 Jan 2010 19:31:24 +1100 Subject: Added tests for rendering different template for new API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- actionmailer/test/base_test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'actionmailer/test') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 03e3f81acd..b7a8bc73de 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -78,6 +78,14 @@ class BaseTest < ActiveSupport::TestCase format.html{ render "welcome" } if include_html end end + + def different_template(template_name='') + mail do |format| + format.text { render :template => template_name } + format.html { render :template => template_name } + end + end + end test "method call to mail does not raise error" do @@ -454,6 +462,12 @@ class BaseTest < ActiveSupport::TestCase mail = BaseMailer.plain_text_only assert_equal('text/plain', mail.mime_type) end + + test "that you can specify a different template" do + mail = BaseMailer.different_template('explicit_multipart_templates') + assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded) + assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded) + end protected -- cgit v1.2.3 From 296007744525638b142501efee57faf6ac4be20f Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Fri, 29 Jan 2010 13:00:12 +0100 Subject: Add a failing test case for render :layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- actionmailer/test/base_test.rb | 15 +++++++++++++++ .../test/fixtures/base_mailer/different_layout.html.erb | 1 + .../test/fixtures/base_mailer/different_layout.text.erb | 1 + .../base_mailer/email_custom_layout.text.html.erb | 1 + .../test/fixtures/layouts/different_layout.html.erb | 1 + .../test/fixtures/layouts/different_layout.text.erb | 1 + 6 files changed, 20 insertions(+) create mode 100644 actionmailer/test/fixtures/base_mailer/different_layout.html.erb create mode 100644 actionmailer/test/fixtures/base_mailer/different_layout.text.erb create mode 100644 actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb create mode 100644 actionmailer/test/fixtures/layouts/different_layout.html.erb create mode 100644 actionmailer/test/fixtures/layouts/different_layout.text.erb (limited to 'actionmailer/test') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index b7a8bc73de..2d3f8ac13a 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -86,6 +86,15 @@ class BaseTest < ActiveSupport::TestCase end end + def different_layout(layout_name='') + mail do |format| + format.text { + render :layout => layout_name + } + format.html { render :layout => layout_name } + end + end + end test "method call to mail does not raise error" do @@ -469,6 +478,12 @@ class BaseTest < ActiveSupport::TestCase assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded) end + test "that you can specify a different layout" do + mail = BaseMailer.different_layout('different_layout') + assert_equal("HTML -- HTML", mail.html_part.body.decoded) + assert_equal("PLAIN -- PLAIN", mail.text_part.body.decoded) + end + protected # Execute the block setting the given values and restoring old values after diff --git a/actionmailer/test/fixtures/base_mailer/different_layout.html.erb b/actionmailer/test/fixtures/base_mailer/different_layout.html.erb new file mode 100644 index 0000000000..3225efc49a --- /dev/null +++ b/actionmailer/test/fixtures/base_mailer/different_layout.html.erb @@ -0,0 +1 @@ +HTML \ No newline at end of file diff --git a/actionmailer/test/fixtures/base_mailer/different_layout.text.erb b/actionmailer/test/fixtures/base_mailer/different_layout.text.erb new file mode 100644 index 0000000000..b547f4a332 --- /dev/null +++ b/actionmailer/test/fixtures/base_mailer/different_layout.text.erb @@ -0,0 +1 @@ +PLAIN \ No newline at end of file diff --git a/actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb b/actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb new file mode 100644 index 0000000000..a2187308b6 --- /dev/null +++ b/actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb @@ -0,0 +1 @@ +body_text \ No newline at end of file diff --git a/actionmailer/test/fixtures/layouts/different_layout.html.erb b/actionmailer/test/fixtures/layouts/different_layout.html.erb new file mode 100644 index 0000000000..99eb026ae1 --- /dev/null +++ b/actionmailer/test/fixtures/layouts/different_layout.html.erb @@ -0,0 +1 @@ +HTML -- <%= yield %> \ No newline at end of file diff --git a/actionmailer/test/fixtures/layouts/different_layout.text.erb b/actionmailer/test/fixtures/layouts/different_layout.text.erb new file mode 100644 index 0000000000..b93467b7ae --- /dev/null +++ b/actionmailer/test/fixtures/layouts/different_layout.text.erb @@ -0,0 +1 @@ +PLAIN -- <%= yield %> \ No newline at end of file -- cgit v1.2.3 From 3f8409193716669b9fa61ac74ae1c92cfde00785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 29 Jan 2010 16:16:01 +0100 Subject: ActionMailer should depend just on AbstractController. --- actionmailer/test/base_test.rb | 33 +++++++++++++++++---------------- actionmailer/test/old_base/url_test.rb | 3 +++ 2 files changed, 20 insertions(+), 16 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 2d3f8ac13a..57bfe2375e 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -415,6 +415,21 @@ class BaseTest < ActiveSupport::TestCase assert_equal("7bit", email.parts[1].content_transfer_encoding) end + test "explicit multipart should be multipart" do + mail = BaseMailer.explicit_multipart + assert_not_nil(mail.content_type_parameters[:boundary]) + end + + test "should set a content type if only has an html part" do + mail = BaseMailer.html_only + assert_equal('text/html', mail.mime_type) + end + + test "should set a content type if only has an plain text part" do + mail = BaseMailer.plain_text_only + assert_equal('text/plain', mail.mime_type) + end + test "explicit multipart with one part is rendered as body" do email = BaseMailer.custom_block assert_equal(0, email.parts.size) @@ -456,22 +471,8 @@ class BaseTest < ActiveSupport::TestCase BaseMailer.expects(:welcome).returns(mail) BaseMailer.welcome.deliver end - - test "explicit multipart should be multipart" do - mail = BaseMailer.explicit_multipart - assert_not_nil(mail.content_type_parameters[:boundary]) - end - - test "should set a content type if only has an html part" do - mail = BaseMailer.html_only - assert_equal('text/html', mail.mime_type) - end - - test "should set a content type if only has an plain text part" do - mail = BaseMailer.plain_text_only - assert_equal('text/plain', mail.mime_type) - end - + + # Rendering test "that you can specify a different template" do mail = BaseMailer.different_template('explicit_multipart_templates') assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded) diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb index 5affb47997..ad8b1109c9 100644 --- a/actionmailer/test/old_base/url_test.rb +++ b/actionmailer/test/old_base/url_test.rb @@ -1,9 +1,12 @@ require 'abstract_unit' +require 'action_controller' class WelcomeController < ActionController::Base end class TestMailer < ActionMailer::Base + include ActionController::UrlFor + default_url_options[:host] = 'www.basecamphq.com' def signed_up_with_url(recipient) -- cgit v1.2.3 From 17ea8d8d4d81b4b9fb40bd6c6ee80f4acf3bad94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 29 Jan 2010 17:41:10 +0100 Subject: Automatically configure generators if application is defined. --- actionmailer/test/old_base/url_test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb index ad8b1109c9..d851431c7a 100644 --- a/actionmailer/test/old_base/url_test.rb +++ b/actionmailer/test/old_base/url_test.rb @@ -4,9 +4,11 @@ require 'action_controller' class WelcomeController < ActionController::Base end -class TestMailer < ActionMailer::Base +class ActionMailer::Base include ActionController::UrlFor +end +class TestMailer < ActionMailer::Base default_url_options[:host] = 'www.basecamphq.com' def signed_up_with_url(recipient) -- cgit v1.2.3 From 2d567e470adb9241b400e02ccb0501efb7d09b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 30 Jan 2010 16:39:27 +0100 Subject: Add transfer_encoding= setter deprecation. --- actionmailer/test/old_base/tmail_compat_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'actionmailer/test') diff --git a/actionmailer/test/old_base/tmail_compat_test.rb b/actionmailer/test/old_base/tmail_compat_test.rb index 7c1d9a07c1..255205de84 100644 --- a/actionmailer/test/old_base/tmail_compat_test.rb +++ b/actionmailer/test/old_base/tmail_compat_test.rb @@ -21,5 +21,15 @@ class TmailCompatTest < ActiveSupport::TestCase end assert_equal mail.content_transfer_encoding, "base64" end + + def test_transfer_encoding_setter_raises_deprecation_warning + mail = Mail.new + assert_deprecated do + assert_nothing_raised do + mail.transfer_encoding = "base64" + end + end + assert_equal mail.content_transfer_encoding, "base64" + end end -- cgit v1.2.3