Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Ruby 1.9 compat: compare with same encoding

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9218 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 5c17a74d59f9525744e30d64472e8b43e808ba6f 1 parent c9aaad7
Jeremy Kemper jeremy authored
6 actionmailer/test/mail_service_test.rb
View
@@ -840,7 +840,11 @@ def test_decode_encoded_attachment_filename
fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
mail = TMail::Mail.parse(fixture)
attachment = mail.attachments.last
- assert_equal "01 Quien Te Dij\212at. Pitbull.mp3", attachment.original_filename
+
+ expected = "01 Quien Te Dij\212at. Pitbull.mp3"
+ expected.force_encoding(Encoding::ASCII_8BIT) if expected.respond_to?(:force_encoding)
+
+ assert_equal expected, attachment.original_filename
end
def test_wrong_mail_header
23 actionmailer/test/quoting_test.rb
View
@@ -73,18 +73,15 @@ def test_email_with_partially_quoted_subject
assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject
end
- def test_decode
- encoded, decoded = expected_base64_strings
- assert_equal decoded, TMail::Base64.decode(encoded)
- end
+ def test_base64_encoding
+ encoded = read_fixture('raw_base64_encoded_string')
+ decoded = read_fixture('raw_base64_decoded_string')
- def test_encode
- encoded, decoded = expected_base64_strings
- assert_equal encoded.length, TMail::Base64.encode(decoded).length
+ assert_equal encoded, TMail::Base64.encode(decoded)
+ assert_equal decoded, TMail::Base64.decode(encoded)
end
private
-
# This whole thing *could* be much simpler, but I don't think Tempfile,
# popen and others exist on all platforms (like Windows).
def execute_in_sandbox(code)
@@ -107,7 +104,13 @@ def execute_in_sandbox(code)
File.delete(res_name) rescue nil
end
- def expected_base64_strings
- [ File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_encoded_string"), File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_decoded_string") ]
+ if RUBY_VERSION >= '1.9'
+ def read_fixture(name)
+ File.open("#{File.dirname(__FILE__)}/fixtures/raw_base64_encoded_string", 'r:ascii-8bit') { |f| f.read }
+ end
+ else
+ def read_fixture(name)
+ File.read("#{File.dirname(__FILE__)}/fixtures/raw_base64_encoded_string")
+ end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.