From 8268d68b509cc9da1f6fe14dc61430f781222fd0 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sat, 16 Jan 2010 16:26:53 -0200 Subject: mail.create_path returns an array test fixed [#3712 status:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- actionmailer/test/mail_service_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index cd41739f1a..03bd0c238c 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -1078,7 +1078,7 @@ EOF def test_return_path_with_create mail = TestMailer.create_return_path - assert_equal "another@somewhere.test", mail.return_path + assert_equal ["another@somewhere.test"], mail.return_path end def test_return_path_with_deliver -- cgit v1.2.3 From a0374582ff6d403a48b018df666b064f4c261f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 19 Jan 2010 01:15:57 +0100 Subject: Bring body(Hash) behavior back. --- actionmailer/test/mail_service_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 03bd0c238c..d1c4f7b5e9 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -301,7 +301,6 @@ class TestMailer < ActionMailer::Base render :text => "testing" end - # This tests body calls accepeting a hash, which is deprecated. def body_ivar(recipient) recipients recipient subject "Body as a local variable" @@ -1089,8 +1088,7 @@ EOF end def test_body_is_stored_as_an_ivar - mail = nil - ActiveSupport::Deprecation.silence { mail = TestMailer.create_body_ivar(@recipient) } + mail = TestMailer.create_body_ivar(@recipient) assert_equal "body: foo\nbar: baz", mail.body.to_s end -- cgit v1.2.3 From f00cbf78725caa44ca46150c4708f9a4fad0e023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 19 Jan 2010 01:35:41 +0100 Subject: Bring render_message back for 2.3 compatibility. --- actionmailer/test/mail_service_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index d1c4f7b5e9..f87d9b2e5b 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -120,11 +120,11 @@ class TestMailer < ActionMailer::Base content_type "multipart/alternative" part "text/plain" do |p| - p.body = "blah" + p.body = render_message(:text => "blah") end part "text/html" do |p| - p.body = "blah" + p.body = render_message(:inline => "<%= content_tag(:b, 'blah') %>") end end -- cgit v1.2.3