diff options
Diffstat (limited to 'actionmailer/test/delivery_methods_test.rb')
| -rw-r--r-- | actionmailer/test/delivery_methods_test.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb index 08f84dbf3b..886e79aae9 100644 --- a/actionmailer/test/delivery_methods_test.rb +++ b/actionmailer/test/delivery_methods_test.rb @@ -82,6 +82,7 @@ class MailDeliveryTest < ActiveSupport::TestCase def welcome(hash={}) mail(DEFAULT_HEADERS.merge(hash)) end + end def setup @@ -129,6 +130,18 @@ class MailDeliveryTest < ActiveSupport::TestCase DeliveryMailer.welcome.deliver end + test "does not perform deliveries if customized per instance" do + DeliveryMailer.perform_deliveries = true + m = DeliveryMailer.welcome(:perform_deliveries => false) + assert_equal(false,m.perform_deliveries) + end + + test "does not perform deliveries if globally set to off but instance instructs delivery" do + DeliveryMailer.perform_deliveries = false + m = DeliveryMailer.welcome(:perform_deliveries => true) + assert_equal(false,m.perform_deliveries) + end + test "does not append the deliveries collection if told not to perform the delivery" do DeliveryMailer.perform_deliveries = false DeliveryMailer.deliveries.clear |