Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3475 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 11 insertions, 1 deletions

diff --git a/actionmailer/test/fixtures/raw_email7 b/actionmailer/test/fixtures/raw_email7
index 251172a71f..da64ada8a5 100644
--- a/actionmailer/test/fixtures/raw_email7
+++ b/actionmailer/test/fixtures/raw_email7
@@ -22,6 +22,16 @@ Content-Type: text/plain;
 This is the first part.
 
 --Apple-Mail-12-196940926
+Content-Transfer-Encoding: 7bit
+Content-Type: text/x-ruby-script;
+	x-unix-mode=0666;
+	name="test.rb"
+Content-Disposition: attachment;
+	filename=test.rb
+
+puts "testing, testing"
+
+--Apple-Mail-12-196940926
 Content-Transfer-Encoding: base64
 Content-Type: application/pdf;
 	x-unix-mode=0666;
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 94dd70200b..4d569da31f 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -704,7 +704,7 @@ EOF
   def test_recursive_multipart_processing
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email7")
     mail = TMail::Mail.parse(fixture)
-    assert_equal "This is the first part.\n\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body
+    assert_equal "This is the first part.\n\nAttachment: test.rb\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body
   end
 
   def test_decode_encoded_attachment_filename