aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-25 13:39:48 +1100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-25 13:39:48 +1100
commite4a989e9d99b9860859ad14b5a6fca62a4009cf9 (patch)
tree3c1f8c125517c17d5709f3c7545199e2e59cd941 /actionmailer/test
parente1c131863897390d04bd5515765236590747f2c1 (diff)
downloadrails-e4a989e9d99b9860859ad14b5a6fca62a4009cf9.tar.gz
rails-e4a989e9d99b9860859ad14b5a6fca62a4009cf9.tar.bz2
rails-e4a989e9d99b9860859ad14b5a6fca62a4009cf9.zip
Added delivery_handler method to mail and implemented in ActionMailer to deliver inside of instrumentation
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/base_test.rb7
-rw-r--r--actionmailer/test/delivery_methods_test.rb30
2 files changed, 31 insertions, 6 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index d8616ee3be..81e1df3911 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -354,7 +354,12 @@ class BaseTest < ActiveSupport::TestCase
test "calling deliver on the action should deliver the mail object" do
BaseMailer.deliveries.clear
- BaseMailer.expects(:delivered_email).once
+ BaseMailer.expects(:deliver_mail).once
+ BaseMailer.welcome.deliver
+ end
+
+ test "calling deliver on the action should increment the deliveries collection" do
+ BaseMailer.deliveries.clear
BaseMailer.welcome.deliver
assert_equal(1, BaseMailer.deliveries.length)
end
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
index 145f8ba30d..e70e8acd9b 100644
--- a/actionmailer/test/delivery_methods_test.rb
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -94,9 +94,8 @@ class MailDeliveryTest < ActiveSupport::TestCase
test "ActionMailer should be told when Mail gets delivered" do
DeliveryMailer.deliveries.clear
- DeliveryMailer.expects(:delivered_email).once
+ DeliveryMailer.expects(:deliver_mail).once
DeliveryMailer.welcome.deliver
- assert_equal(1, DeliveryMailer.deliveries.length)
end
test "delivery method can be customized per instance" do
@@ -124,7 +123,13 @@ class MailDeliveryTest < ActiveSupport::TestCase
test "does not perform deliveries if requested" do
DeliveryMailer.perform_deliveries = false
DeliveryMailer.deliveries.clear
- DeliveryMailer.expects(:delivered_email).never
+ Mail::Message.any_instance.expects(:deliver!).never
+ DeliveryMailer.welcome.deliver
+ end
+
+ test "does not append the deliveries collection if told not to perform the delivery" do
+ DeliveryMailer.perform_deliveries = false
+ DeliveryMailer.deliveries.clear
DeliveryMailer.welcome.deliver
assert_equal(0, DeliveryMailer.deliveries.length)
end
@@ -132,7 +137,14 @@ class MailDeliveryTest < ActiveSupport::TestCase
test "raise errors on bogus deliveries" do
DeliveryMailer.delivery_method = BogusDelivery
DeliveryMailer.deliveries.clear
- DeliveryMailer.expects(:delivered_email).never
+ assert_raise RuntimeError do
+ DeliveryMailer.welcome.deliver
+ end
+ end
+
+ test "does not increment the deliveries collection on error" do
+ DeliveryMailer.delivery_method = BogusDelivery
+ DeliveryMailer.deliveries.clear
assert_raise RuntimeError do
DeliveryMailer.welcome.deliver
end
@@ -142,9 +154,17 @@ class MailDeliveryTest < ActiveSupport::TestCase
test "does not raise errors on bogus deliveries if set" do
DeliveryMailer.delivery_method = BogusDelivery
DeliveryMailer.raise_delivery_errors = false
+ assert_nothing_raised do
+ DeliveryMailer.welcome.deliver
+ end
+ end
+
+ test "increments the deliveries collection on bogus deliveries if set to ignore" do
+ DeliveryMailer.delivery_method = BogusDelivery
+ DeliveryMailer.raise_delivery_errors = false
DeliveryMailer.deliveries.clear
- DeliveryMailer.expects(:delivered_email).once
DeliveryMailer.welcome.deliver
assert_equal(1, DeliveryMailer.deliveries.length)
end
+
end \ No newline at end of file