From bb55bbd207836d6d2eb1aa3dff1170f81a60131f Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 7 Feb 2010 18:32:52 +1100 Subject: [PATCH] Fixing actionmailer tests for CI --- actionmailer/test/base_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 7e794e10e8..222db66aaa 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -461,7 +461,8 @@ class BaseTest < ActiveSupport::TestCase assert_instance_of Mail::Message, mail end - test "calling deliver on the action should increment the deliveries collection" do + test "calling deliver on the action should increment the deliveries collection if using the test mailer" do + BaseMailer.delivery_method = :test BaseMailer.deliveries.clear BaseMailer.welcome.deliver assert_equal(1, BaseMailer.deliveries.length)