From 258ca148004eaa63740ab2186338b3ac872b8187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim=20and=20Mikel=20Lindsaar?=
 <pair@programming.com>
Date: Sun, 24 Jan 2010 11:15:42 +1100
Subject: Delegated ActionMailer::Base.deliveries to Mail.deliveries, added
 callback support in Mail to call ActionMailer on delivery, moved deliver to
 deprecated API in preparation for new API

---
 actionmailer/test/mail_layout_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionmailer/test/mail_layout_test.rb')

diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb
index b9ff075461..b4bd583616 100644
--- a/actionmailer/test/mail_layout_test.rb
+++ b/actionmailer/test/mail_layout_test.rb
@@ -55,7 +55,7 @@ class LayoutMailerTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    ActionMailer::Base.deliveries.clear
 
     @recipient = 'test@localhost'
   end
-- 
cgit v1.2.3