aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorYuji Yaginuma <yuuji.yaginuma@gmail.com>2018-10-15 05:40:48 +0900
committerGitHub <noreply@github.com>2018-10-15 05:40:48 +0900
commitbc2a77ab2704e7b90920fff6e077e42ddcfff73b (patch)
tree7638c25e39466804d8a85d75a047ae67b6c71ef2 /actionmailer/test
parent99c87ad2474d5c5b6e52ceac34c3cf9f9cb57f9f (diff)
parentd2d6f6b7dbbefea84fe847e9c0dc7313cc82700c (diff)
downloadrails-bc2a77ab2704e7b90920fff6e077e42ddcfff73b.tar.gz
rails-bc2a77ab2704e7b90920fff6e077e42ddcfff73b.tar.bz2
rails-bc2a77ab2704e7b90920fff6e077e42ddcfff73b.zip
Merge pull request #34209 from y-yagi/fix_tests_on_mail_271
Fix tests on Mail 2.7.1
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/base_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 7a1a505398..cbbee9fae8 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -152,9 +152,9 @@ class BaseTest < ActiveSupport::TestCase
assert_equal(2, email.parts.length)
assert_equal("multipart/mixed", email.mime_type)
assert_equal("text/html", email.parts[0].mime_type)
- assert_equal("Attachment with content", email.parts[0].body.encoded)
+ assert_equal("Attachment with content", email.parts[0].decoded)
assert_equal("application/pdf", email.parts[1].mime_type)
- assert_equal("VGhpcyBpcyB0ZXN0IEZpbGUgY29udGVudA==\r\n", email.parts[1].body.encoded)
+ assert_equal("This is test File content", email.parts[1].decoded)
end
test "adds the given :body as part" do
@@ -162,9 +162,9 @@ class BaseTest < ActiveSupport::TestCase
assert_equal(2, email.parts.length)
assert_equal("multipart/mixed", email.mime_type)
assert_equal("text/plain", email.parts[0].mime_type)
- assert_equal("I'm the eggman", email.parts[0].body.encoded)
+ assert_equal("I'm the eggman", email.parts[0].decoded)
assert_equal("application/pdf", email.parts[1].mime_type)
- assert_equal("VGhpcyBpcyB0ZXN0IEZpbGUgY29udGVudA==\r\n", email.parts[1].body.encoded)
+ assert_equal("This is test File content", email.parts[1].decoded)
end
test "can embed an inline attachment" do