diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
| commit | 67b17d029a8eeddd908cce2d4e0e27e4708e8463 (patch) | |
| tree | 4cd589411104f7222835dd5012f4bb7743e1d215 /actionmailer/test/base_test.rb | |
| parent | bb063b2f1b3e5b6fb2a4732cb696929f1652c555 (diff) | |
| parent | 5968d7a65886d3450698889f685eccaf54749f43 (diff) | |
| download | rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.gz rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.bz2 rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'actionmailer/test/base_test.rb')
| -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 1b793d255e..6a7931da8c 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -153,8 +153,8 @@ class BaseTest < ActiveSupport::TestCase assert_equal(2, email.parts.length) assert_equal("multipart/related", email.mime_type) assert_equal("multipart/alternative", email.parts[0].mime_type) - assert_equal("text/plain", email.parts[0].parts[0].mime_type) - assert_equal("text/html", email.parts[0].parts[1].mime_type) + assert_equal("text/plain", email.parts[0].parts[0].mime_type) + assert_equal("text/html", email.parts[0].parts[1].mime_type) assert_equal("logo.png", email.parts[1].filename) end |