aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSergey Nartimov <just.lest@gmail.com>2011-12-25 14:34:58 +0300
committerSergey Nartimov <just.lest@gmail.com>2011-12-25 14:34:58 +0300
commit1e9e88fcd335c7d5a99159d592c3e1b605510a16 (patch)
treed4ccf417d4ed7c999b574ba941cf9ecb68f7882c /actionmailer
parent4c1701c0ca6ae77a8274f59460751d1b1d83ce1b (diff)
downloadrails-1e9e88fcd335c7d5a99159d592c3e1b605510a16.tar.gz
rails-1e9e88fcd335c7d5a99159d592c3e1b605510a16.tar.bz2
rails-1e9e88fcd335c7d5a99159d592c3e1b605510a16.zip
remove checks for encodings availability
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/base_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 9fdd0e1ced..65550ab505 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -107,7 +107,7 @@ class BaseTest < ActiveSupport::TestCase
assert_equal(1, email.attachments.length)
assert_equal('invoice.jpg', email.attachments[0].filename)
expected = "\312\213\254\232)b"
- expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+ expected.force_encoding(Encoding::BINARY)
assert_equal expected, email.attachments['invoice.jpg'].decoded
end
@@ -116,7 +116,7 @@ class BaseTest < ActiveSupport::TestCase
assert_equal(1, email.attachments.length)
assert_equal('invoice.jpg', email.attachments[0].filename)
expected = "\312\213\254\232)b"
- expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+ expected.force_encoding(Encoding::BINARY)
assert_equal expected, email.attachments['invoice.jpg'].decoded
end