back out from r9031 to r9036

On Rails3, 'to_s' is not alias of 'encoded'.
'to_s' is alias of 'decoded'.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9037 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2012-03-01 11:40:22 +00:00
parent 30ce0cd8fb
commit 2df6c99e67
6 changed files with 14 additions and 14 deletions

View File

@@ -470,7 +470,7 @@ class MailerTest < ActiveSupport::TestCase
assert_equal 1, ActionMailer::Base.deliveries.size
mail = last_email
assert mail.bcc.include?('dlopper@somenet.foo')
assert mail.body.to_s.include?('Bug #3: Error 281 when updating a recipe')
assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
assert_equal '1 issue(s) due in the next 42 days', mail.subject
end
@@ -496,7 +496,7 @@ class MailerTest < ActiveSupport::TestCase
assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper
mail = last_email
assert mail.bcc.include?('dlopper@somenet.foo')
assert mail.body.to_s.include?('Bug #3: Error 281 when updating a recipe')
assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
end
def last_email
@@ -514,7 +514,7 @@ class MailerTest < ActiveSupport::TestCase
user.language = 'fr'
Mailer.deliver_account_activated(user)
mail = last_email
assert mail.body.to_s.include?('Votre compte')
assert mail.body.include?('Votre compte')
assert_equal :it, current_language
end

View File

@@ -176,7 +176,7 @@ class RepositoryTest < ActiveSupport::TestCase
assert_not_nil mail
assert mail.subject.starts_with?(
"[#{fixed_issue.project.name} - #{fixed_issue.tracker.name} ##{fixed_issue.id}]")
assert mail.body.to_s.include?(
assert mail.body.include?(
"Status changed from #{old_status} to #{fixed_issue.status}")
# ignoring commits referencing an issue of another project