kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Bring AM tests back to green again.

Browse source
This commit is contained in:
José Valim 2010-01-26 19:50:59 +01:00
parent af43674c1c
commit 9f63c4b26e
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
actionmailer/test/fixtures/nested/layouts/spam.html.erb vendored
View file

@ -1 +0,0 @@
Nested Spammer layout <%= yield %>

15
actionmailer/test/old_base/mail_layout_test.rb
View file

@ -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

2
actionmailer/test/old_base/mail_render_test.rb
View file

@ -68,8 +68,10 @@ class RenderMailer < ActionMailer::Base
end
def build_body_part(content_type, assigns, options = {})
ActiveSupport::Deprecation.silence do
render "#{template}.#{content_type}", :body => assigns
end
end
end
class FirstMailer < ActionMailer::Base