From 9f63c4b26e6afe04849dc906b52177ba5221e3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 26 Jan 2010 19:50:59 +0100 Subject: Bring AM tests back to green again. --- actionmailer/test/fixtures/nested/layouts/spam.html.erb | 1 - actionmailer/test/old_base/mail_layout_test.rb | 15 --------------- actionmailer/test/old_base/mail_render_test.rb | 4 +++- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 actionmailer/test/fixtures/nested/layouts/spam.html.erb (limited to 'actionmailer') diff --git a/actionmailer/test/fixtures/nested/layouts/spam.html.erb b/actionmailer/test/fixtures/nested/layouts/spam.html.erb deleted file mode 100644 index 7a24b19b7f..0000000000 --- a/actionmailer/test/fixtures/nested/layouts/spam.html.erb +++ /dev/null @@ -1 +0,0 @@ -Nested Spammer layout <%= yield %> \ No newline at end of file diff --git a/actionmailer/test/old_base/mail_layout_test.rb b/actionmailer/test/old_base/mail_layout_test.rb index c69252efa9..5679aa5a64 100644 --- a/actionmailer/test/old_base/mail_layout_test.rb +++ b/actionmailer/test/old_base/mail_layout_test.rb @@ -51,16 +51,6 @@ class ExplicitLayoutMailer < ActionMailer::Base end end -class NestedLayoutMailer < ActionMailer::Base - layout 'nested/layouts/spam' - - def signup - recipients 'test@localhost' - subject "You have a mail" - from "tester@example.com" - end -end - class LayoutMailerTest < Test::Unit::TestCase def setup set_delivery_method :test @@ -155,9 +145,4 @@ class LayoutMailerTest < Test::Unit::TestCase mail = ExplicitLayoutMailer.logout assert_equal "You logged out", mail.body.to_s.strip end - - def test_nested_class_layout - mail = NestedLayoutMailer.signup - assert_equal "Nested Spammer layout We do not spam", mail.body.to_s.strip - end end diff --git a/actionmailer/test/old_base/mail_render_test.rb b/actionmailer/test/old_base/mail_render_test.rb index 4213c2a173..405d43d7d3 100644 --- a/actionmailer/test/old_base/mail_render_test.rb +++ b/actionmailer/test/old_base/mail_render_test.rb @@ -68,7 +68,9 @@ class RenderMailer < ActionMailer::Base end def build_body_part(content_type, assigns, options = {}) - render "#{template}.#{content_type}", :body => assigns + ActiveSupport::Deprecation.silence do + render "#{template}.#{content_type}", :body => assigns + end end end -- cgit v1.2.3