aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/tmail_test.rb
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2009-11-12 16:08:50 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2009-11-12 16:08:50 +1100
commit15d7cac282e29f0a8e7b38dade07abb32d97a991 (patch)
tree573d27da4f642b2b16840fbc7621d85acd8634ea /actionmailer/test/tmail_test.rb
parentcbded53671bccccbaf7e9fdfa93ef86cb097daa3 (diff)
downloadrails-15d7cac282e29f0a8e7b38dade07abb32d97a991.tar.gz
rails-15d7cac282e29f0a8e7b38dade07abb32d97a991.tar.bz2
rails-15d7cac282e29f0a8e7b38dade07abb32d97a991.zip
Starting again on actionmailer integration with mail
Diffstat (limited to 'actionmailer/test/tmail_test.rb')
-rw-r--r--actionmailer/test/tmail_test.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/actionmailer/test/tmail_test.rb b/actionmailer/test/tmail_test.rb
index 718990e79e..2097efdd65 100644
--- a/actionmailer/test/tmail_test.rb
+++ b/actionmailer/test/tmail_test.rb
@@ -2,18 +2,19 @@ require 'abstract_unit'
class TMailMailTest < Test::Unit::TestCase
def test_body
- m = TMail::Mail.new
+ m = Mail.new
expected = 'something_with_underscores'
m.encoding = 'quoted-printable'
quoted_body = [expected].pack('*M')
m.body = quoted_body
assert_equal "something_with_underscores=\n", m.quoted_body
- assert_equal expected, m.body
+ # CHANGED: body returns object, not string, Changed m.body to m.body.decoded
+ assert_equal expected, m.body.decoded
end
def test_nested_attachments_are_recognized_correctly
fixture = File.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_nested_attachment")
- mail = TMail::Mail.parse(fixture)
+ mail = Mail.parse(fixture)
assert_equal 2, mail.attachments.length
assert_equal "image/png", mail.attachments.first.content_type
assert_equal 1902, mail.attachments.first.length