diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-02 01:07:08 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-07-02 01:07:12 +0930 |
| commit | afb66a5a598ce4ac74ad84b125a5abf046dcf5aa (patch) | |
| tree | 33d690f194f243a3fb63e69f8393ff46cc396249 /actionmailer | |
| parent | 9ecdcac16795854bd02f1addcf75b84d34bbdf86 (diff) | |
| parent | 3d453b409d037a056d0bcd636a2e020cc7cef4a8 (diff) | |
| download | rails-afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.tar.gz rails-afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.tar.bz2 rails-afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.zip | |
Merge pull request #29506 from pat/frozen-string-literals
Make ActiveSupport frozen-string-literal friendly.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/base_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index ebb97078e6..06d4ea197c 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -120,7 +120,7 @@ class BaseTest < ActiveSupport::TestCase email = BaseMailer.attachment_with_hash assert_equal(1, email.attachments.length) assert_equal("invoice.jpg", email.attachments[0].filename) - expected = "\312\213\254\232)b" + expected = "\312\213\254\232)b".dup expected.force_encoding(Encoding::BINARY) assert_equal expected, email.attachments["invoice.jpg"].decoded end @@ -129,7 +129,7 @@ class BaseTest < ActiveSupport::TestCase email = BaseMailer.attachment_with_hash_default_encoding assert_equal(1, email.attachments.length) assert_equal("invoice.jpg", email.attachments[0].filename) - expected = "\312\213\254\232)b" + expected = "\312\213\254\232)b".dup expected.force_encoding(Encoding::BINARY) assert_equal expected, email.attachments["invoice.jpg"].decoded end |