aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorYoshiyuki Kinjo <yskkin@gmail.com>2018-09-09 20:16:20 +0900
committerYoshiyuki Kinjo <yskkin@gmail.com>2018-09-09 20:17:36 +0900
commit576209b45bf6d20e91562da77e454bc58bda3658 (patch)
tree4e9875069319fd7254a43082b4c44ffabbe56895 /actionmailer/test
parent383b8bc8e215d5fa2b018d6f0b9c363ea95251cf (diff)
downloadrails-576209b45bf6d20e91562da77e454bc58bda3658.tar.gz
rails-576209b45bf6d20e91562da77e454bc58bda3658.tar.bz2
rails-576209b45bf6d20e91562da77e454bc58bda3658.zip
Add `perform_deliveries` to a payload of `deliver.action_mailer` notification.
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/log_subscriber_test.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/actionmailer/test/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb
index 48edb80c0c..7686fd10c9 100644
--- a/actionmailer/test/log_subscriber_test.rb
+++ b/actionmailer/test/log_subscriber_test.rb
@@ -37,13 +37,16 @@ class AMLogSubscriberTest < ActionMailer::TestCase
BaseMailer.deliveries.clear
end
- def test_deliver_is_not_notified_when_perform_deliveries_is_false
+ def test_deliver_message_when_perform_deliveries_is_false
BaseMailer.welcome_without_deliveries.deliver_now
wait
- assert_equal(0, @logger.logged(:info).size)
- assert_equal(1, @logger.logged(:debug).size)
+ assert_equal(1, @logger.logged(:info).size)
+ assert_match("Skipped sending mail to system@test.lindsaar.net as `perform_deliveries` is false", @logger.logged(:info).first)
+
+ assert_equal(2, @logger.logged(:debug).size)
assert_match(/BaseMailer#welcome_without_deliveries: processed outbound mail in [\d.]+ms/, @logger.logged(:debug).first)
+ assert_match("Welcome", @logger.logged(:debug).second)
ensure
BaseMailer.deliveries.clear
end