From 7c8424e057b53cf12ce1c748b09601e720be6a09 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 30 Jul 2012 23:57:20 +0530
Subject: allow perform deliveries to be set within mailer action
---
actionmailer/test/delivery_methods_test.rb | 13 +++++++++++++
1 file changed, 13 insertions(+)
(limited to 'actionmailer/test')
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
--
cgit v1.2.3