diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-09-22 23:22:58 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-09-22 23:22:58 +0200 |
commit | 686897225e9d0372deac71a6dfdf881676bb3dea (patch) | |
tree | 1dc218eeaa7161f3ff000b9ca0aa8bc18d615665 | |
parent | 7805fa2b0bdc49d1cc0f8e139739066c0f0b3f6c (diff) | |
parent | ecc94736223e2308958a18aefb80e79ec5111d76 (diff) | |
download | rails-686897225e9d0372deac71a6dfdf881676bb3dea.tar.gz rails-686897225e9d0372deac71a6dfdf881676bb3dea.tar.bz2 rails-686897225e9d0372deac71a6dfdf881676bb3dea.zip |
Merge pull request #21722 from ronakjangir47/test_delivery_methods
Added assertion for error messages for nil and unknown delivery methods
-rw-r--r-- | actionmailer/test/delivery_methods_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb index ceaa4ca83e..d17e774092 100644 --- a/actionmailer/test/delivery_methods_test.rb +++ b/actionmailer/test/delivery_methods_test.rb @@ -165,16 +165,18 @@ class MailDeliveryTest < ActiveSupport::TestCase test "non registered delivery methods raises errors" do DeliveryMailer.delivery_method = :unknown - assert_raise RuntimeError do + error = assert_raise RuntimeError do DeliveryMailer.welcome.deliver_now end + assert_equal "Invalid delivery method :unknown", error.message end test "undefined delivery methods raises errors" do DeliveryMailer.delivery_method = nil - assert_raise RuntimeError do + error = assert_raise RuntimeError do DeliveryMailer.welcome.deliver_now end + assert_equal "Delivery method cannot be nil", error.message end test "does not perform deliveries if requested" do |