aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/mail_layout_test.rb
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2009-12-27 20:56:16 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2009-12-27 20:56:16 +1100
commit331d375cc332e9e8a30a7f9e745414769b780c54 (patch)
treeab4ec042bd652bb40eafa92aa73c6eb9e7335032 /actionmailer/test/mail_layout_test.rb
parentd9aadb5b2d79f3f647d5fddd1dae0910d7b83444 (diff)
downloadrails-331d375cc332e9e8a30a7f9e745414769b780c54.tar.gz
rails-331d375cc332e9e8a30a7f9e745414769b780c54.tar.bz2
rails-331d375cc332e9e8a30a7f9e745414769b780c54.zip
Changing body to use :to_s instead of :decoded... better use case
Diffstat (limited to 'actionmailer/test/mail_layout_test.rb')
-rw-r--r--actionmailer/test/mail_layout_test.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb
index 4775545039..84f13a6d3c 100644
--- a/actionmailer/test/mail_layout_test.rb
+++ b/actionmailer/test/mail_layout_test.rb
@@ -65,7 +65,7 @@ class LayoutMailerTest < Test::Unit::TestCase
def test_should_pickup_default_layout
mail = AutoLayoutMailer.create_hello(@recipient)
- assert_equal "Hello from layout Inside", mail.body.decoded.strip
+ assert_equal "Hello from layout Inside", mail.body.to_s.strip
end
def test_should_pickup_multipart_layout
@@ -81,7 +81,7 @@ class LayoutMailerTest < Test::Unit::TestCase
# CHANGED: body returns an object
# assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
- assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.decoded
+ assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
# CHANGED: content_type returns an object
# assert_equal 'text/html', mail.parts.last.content_type
@@ -89,7 +89,7 @@ class LayoutMailerTest < Test::Unit::TestCase
# CHANGED: body returns an object
# assert_equal "Hello from layout text/html multipart", mail.parts.last.body
- assert_equal "Hello from layout text/html multipart", mail.parts.last.body.decoded
+ assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
end
def test_should_pickup_multipartmixed_layout
@@ -104,14 +104,14 @@ class LayoutMailerTest < Test::Unit::TestCase
assert_equal 'text/plain', mail.parts.first.content_type.string
# CHANGED: body returns an object
# assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
- assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.decoded
+ assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
# CHANGED: content_type returns an object
# assert_equal 'text/html', mail.parts.last.content_type
assert_equal 'text/html', mail.parts.last.content_type.string
# CHANGED: body returns an object
# assert_equal "Hello from layout text/html multipart", mail.parts.last.body
- assert_equal "Hello from layout text/html multipart", mail.parts.last.body.decoded
+ assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
end
def test_should_fix_multipart_layout
@@ -120,30 +120,30 @@ class LayoutMailerTest < Test::Unit::TestCase
assert_equal 2, mail.parts.size
assert_equal 'text/plain', mail.parts.first.content_type.string
- assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.decoded
+ assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
assert_equal 'text/html', mail.parts.last.content_type.string
- assert_equal "Hello from layout text/html multipart", mail.parts.last.body.decoded
+ assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
end
def test_should_pickup_layout_given_to_render
mail = AutoLayoutMailer.create_spam(@recipient)
- assert_equal "Spammer layout Hello, Earth", mail.body.decoded.strip
+ assert_equal "Spammer layout Hello, Earth", mail.body.to_s.strip
end
def test_should_respect_layout_false
mail = AutoLayoutMailer.create_nolayout(@recipient)
- assert_equal "Hello, Earth", mail.body.decoded.strip
+ assert_equal "Hello, Earth", mail.body.to_s.strip
end
def test_explicit_class_layout
mail = ExplicitLayoutMailer.create_signup(@recipient)
- assert_equal "Spammer layout We do not spam", mail.body.decoded.strip
+ assert_equal "Spammer layout We do not spam", mail.body.to_s.strip
end
def test_explicit_layout_exceptions
mail = ExplicitLayoutMailer.create_logout(@recipient)
- assert_equal "You logged out", mail.body.decoded.strip
+ assert_equal "You logged out", mail.body.to_s.strip
end
end