aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-07 03:18:45 -0300
committerYehuda Katz <wycats@gmail.com>2009-08-07 03:18:45 -0300
commit0612fd0f09977dece11a0325a0d7ee07c5cab35c (patch)
treed225dd3b608eca95a388f61bda4225de75654a79 /actionmailer/test
parentb3e199f6981b2fbf062fe668ff93b7dc56e98a38 (diff)
downloadrails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.tar.gz
rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.tar.bz2
rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.zip
Replace _render_template_with_layout with _render_template since the layout is optional
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/mail_service_test.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 30d1b836c4..f2a8c2303c 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -573,12 +573,14 @@ class ActionMailerTest < Test::Unit::TestCase
@info_contents, @debug_contents = "", ""
end
- def info(str)
- @info_contents << str
+ def info(str = nil, &blk)
+ @info_contents << str if str
+ @info_contents << blk.call if block_given?
end
- def debug(str)
- @debug_contents << str
+ def debug(str = nil, &blk)
+ @debug_contents << str if str
+ @debug_contents << blk.call if block_given?
end
end