diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-03-01 11:40:22 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-03-01 11:40:22 +0000 |
| commit | 2df6c99e675d3edaa2aac2e473cfee2304afa5cf (patch) | |
| tree | 1d93b4fda9aadf2c630b88ace8e73a8cdd9ef7c1 /test/unit | |
| parent | 30ce0cd8fb28957f0d15423e12de7024fb94ac50 (diff) | |
| download | redmine-2df6c99e675d3edaa2aac2e473cfee2304afa5cf.tar.gz redmine-2df6c99e675d3edaa2aac2e473cfee2304afa5cf.zip | |
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
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/mailer_test.rb | 6 | ||||
| -rw-r--r-- | test/unit/repository_test.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index f39f3cdbe..18a045713 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -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 diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 859fafc85..9d31f0048 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -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 |