2 files changed, 27 insertions, 1 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index b8d2e46241..f1f5f38482 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -42,12 +42,18 @@ class BaseTest < Test::Unit::TestCase
   class TestMailer < ActionMailer::Base
     
     def welcome(hash = {})
-      headers['X-SPAM'] = "Not SPAM"
       hash = {:to => 'mikel@test.lindsaar.net', :from => 'jose@test.plataformatec.com',
               :subject => 'The first email on new API!'}.merge!(hash)
       mail(hash)
     end
     
+    def invoice(hash = {})
+      attachments['invoice.pdf'] = 'This is test File content'
+      hash = {:to => 'mikel@test.lindsaar.net', :from => 'jose@test.plataformatec.com',
+              :subject => 'Your invoice is attached'}.merge!(hash)
+      mail(hash)
+    end
+    
   end
 
   def test_the_method_call_to_mail_does_not_raise_error
@@ -84,6 +90,25 @@ class BaseTest < Test::Unit::TestCase
 #    assert_equal("Not SPAM", email['X-SPAM'])
 #  end
 
+  def test_should_allow_you_to_send_an_attachment
+    assert_nothing_raised { TestMailer.deliver_invoice }
+  end
+
+  def test_should_allow_you_to_send_an_attachment
+    email = TestMailer.deliver_invoice
+    assert_equal(1, email.attachments.length)
+  end
+
+  def test_should_allow_you_to_send_an_attachment
+    email = TestMailer.deliver_invoice
+    assert_equal('invoice.pdf', email.attachments[0].filename)
+  end
+
+  def test_should_allow_you_to_send_an_attachment
+    email = TestMailer.deliver_invoice
+    assert_equal('This is test File content', email.attachments['invoice.pdf'].decoded)
+  end
+
   def test_should_use_class_defaults
     
   end
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 396dd00a91..f83e13f16f 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -898,6 +898,7 @@ EOF
     assert_equal "iso-8859-1", mail.parts[1].charset
 
     assert_equal "image/jpeg", mail.parts[2].mime_type
+    
     assert_equal "attachment", mail.parts[2][:content_disposition].disposition_type
     assert_equal "foo.jpg", mail.parts[2][:content_disposition].filename
     assert_equal "foo.jpg", mail.parts[2][:content_type].filename