diff options
author | Michael Koziarski <michael@koziarski.com> | 2007-12-02 20:31:39 +0000 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2007-12-02 20:31:39 +0000 |
commit | f1047173e8d2ccc3a65ed434445bd2807df86614 (patch) | |
tree | 85eace5382a1d72e2071bd336d858b68ceca8fa8 /actionmailer/test | |
parent | c84c0437d788f8534db79e0921a64df57c29f345 (diff) | |
download | rails-f1047173e8d2ccc3a65ed434445bd2807df86614.tar.gz rails-f1047173e8d2ccc3a65ed434445bd2807df86614.tar.bz2 rails-f1047173e8d2ccc3a65ed434445bd2807df86614.zip |
Remove old tests which relied on @ being an ATOM to work around old Mail.app bugs. Closes #10317 [mikel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8257 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test')
-rw-r--r-- | actionmailer/test/fixtures/raw_email11 | 34 | ||||
-rwxr-xr-x | actionmailer/test/mail_service_test.rb | 6 | ||||
-rw-r--r-- | actionmailer/test/quoting_test.rb | 30 |
3 files changed, 4 insertions, 66 deletions
diff --git a/actionmailer/test/fixtures/raw_email11 b/actionmailer/test/fixtures/raw_email11 deleted file mode 100644 index 8af74b87cf..0000000000 --- a/actionmailer/test/fixtures/raw_email11 +++ /dev/null @@ -1,34 +0,0 @@ -From xxx@xxxx.com Wed Apr 27 14:15:31 2005 -Mime-Version: 1.0 (Apple Message framework v619.2) -To: xxxxx@xxxxx <matmail> -Message-Id: <416eaebec6d333ec6939eaf8a7d80724@xxxxx> -Content-Type: multipart/alternative; - boundary=Apple-Mail-5-1037861608 -From: xxxxx@xxxxx <xxxxx@xxxxx> -Subject: worse when you use them. -Date: Wed, 27 Apr 2005 14:15:31 -0700 - - - - ---Apple-Mail-5-1037861608 -Content-Transfer-Encoding: 7bit -Content-Type: text/plain; - charset=US-ASCII; - format=flowed - - -XXXXX Xxxxx - ---Apple-Mail-5-1037861608 -Content-Transfer-Encoding: 7bit -Content-Type: text/enriched; - charset=US-ASCII - - - -<bold>XXXXX Xxxxx</bold> - - ---Apple-Mail-5-1037861608-- - diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index ad2e8afd2b..eb408f96cf 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -852,12 +852,6 @@ EOF assert_nothing_raised { mail.body } end - def test_decode_message_with_unquoted_atchar_in_header - fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email11") - mail = TMail::Mail.parse(fixture) - assert_not_nil mail.from - end - def test_empty_header_values_omitted result = TestMailer.create_unnamed_attachment(@recipient).encoded assert_match %r{Content-Type: application/octet-stream[^;]}, result diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb index 4af9014e43..14981571df 100644 --- a/actionmailer/test/quoting_test.rb +++ b/actionmailer/test/quoting_test.rb @@ -70,36 +70,14 @@ class QuotingTest < Test::Unit::TestCase assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject end - def test_rb_decode + def test_decode encoded, decoded = expected_base64_strings - assert_equal decoded, TMail::Base64.rb_decode(encoded) + assert_equal decoded, TMail::Base64.decode(encoded) end - def test_rb_encode + def test_encode encoded, decoded = expected_base64_strings - assert_equal encoded.length, TMail::Base64.rb_encode(decoded).length - end - - def test_rb_decode_should_match_c_decode_if_available - encoded, decoded = expected_base64_strings - - begin - require 'tmail/base64.so' - assert_equal TMail::Base64.rb_decode(encoded), TMail::Base64.c_decode(encoded) - rescue LoadError - # No .so - end - end - - def test_rb_encode_should_match_c_encode_if_available - encoded, decoded = expected_base64_strings - - begin - require 'tmail/base64.so' - assert_equal TMail::Base64.rb_encode(decoded), TMail::Base64.c_encode(decoded) - rescue LoadError - # No .so - end + assert_equal encoded.length, TMail::Base64.encode(decoded).length end private |