##// END OF EJS Templates
Don't change Setting.default_language in Mailer tests....
Jean-Philippe Lang -
r13543:cb8639a7b22f
parent child
Show More
@@ -34,11 +34,11 class MailerTest < ActiveSupport::TestCase
34 34 Setting.host_name = 'mydomain.foo'
35 35 Setting.protocol = 'http'
36 36 Setting.plain_text_mail = '0'
37 Setting.default_language = 'en'
37 38 User.current = nil
38 39 end
39 40
40 41 def test_generated_links_in_emails
41 Setting.default_language = 'en'
42 42 Setting.host_name = 'mydomain.foo'
43 43 Setting.protocol = 'https'
44 44
@@ -79,7 +79,6 class MailerTest < ActiveSupport::TestCase
79 79 end
80 80
81 81 def test_generated_links_with_prefix
82 Setting.default_language = 'en'
83 82 relative_url_root = Redmine::Utils.relative_url_root
84 83 Setting.host_name = 'mydomain.foo/rdm'
85 84 Setting.protocol = 'http'
@@ -131,7 +130,6 class MailerTest < ActiveSupport::TestCase
131 130 end
132 131
133 132 def test_generated_links_with_prefix_and_no_relative_url_root
134 Setting.default_language = 'en'
135 133 relative_url_root = Redmine::Utils.relative_url_root
136 134 Setting.host_name = 'mydomain.foo/rdm'
137 135 Setting.protocol = 'http'
@@ -346,7 +344,6 class MailerTest < ActiveSupport::TestCase
346 344 end
347 345
348 346 def test_issue_add_should_include_enabled_fields
349 Setting.default_language = 'en'
350 347 issue = Issue.find(2)
351 348 assert Mailer.deliver_issue_add(issue)
352 349 assert_mail_body_match '* Target version: 1.0', last_email
@@ -356,7 +353,6 class MailerTest < ActiveSupport::TestCase
356 353 end
357 354
358 355 def test_issue_add_should_not_include_disabled_fields
359 Setting.default_language = 'en'
360 356 issue = Issue.find(2)
361 357 tracker = issue.tracker
362 358 tracker.core_fields -= ['fixed_version_id']
@@ -371,16 +367,14 class MailerTest < ActiveSupport::TestCase
371 367 # test mailer methods for each language
372 368 def test_issue_add
373 369 issue = Issue.find(1)
374 valid_languages.each do |lang|
375 Setting.default_language = lang.to_s
370 with_each_language_as_default do
376 371 assert Mailer.deliver_issue_add(issue)
377 372 end
378 373 end
379 374
380 375 def test_issue_edit
381 376 journal = Journal.find(1)
382 valid_languages.each do |lang|
383 Setting.default_language = lang.to_s
377 with_each_language_as_default do
384 378 assert Mailer.deliver_issue_edit(journal)
385 379 end
386 380 end
@@ -444,16 +438,14 class MailerTest < ActiveSupport::TestCase
444 438
445 439 def test_document_added
446 440 document = Document.find(1)
447 valid_languages.each do |lang|
448 Setting.default_language = lang.to_s
441 with_each_language_as_default do
449 442 assert Mailer.document_added(document).deliver
450 443 end
451 444 end
452 445
453 446 def test_attachments_added
454 447 attachements = [ Attachment.find_by_container_type('Document') ]
455 valid_languages.each do |lang|
456 Setting.default_language = lang.to_s
448 with_each_language_as_default do
457 449 assert Mailer.attachments_added(attachements).deliver
458 450 end
459 451 end
@@ -480,8 +472,7 class MailerTest < ActiveSupport::TestCase
480 472
481 473 def test_news_added
482 474 news = News.first
483 valid_languages.each do |lang|
484 Setting.default_language = lang.to_s
475 with_each_language_as_default do
485 476 assert Mailer.news_added(news).deliver
486 477 end
487 478 end
@@ -499,8 +490,7 class MailerTest < ActiveSupport::TestCase
499 490
500 491 def test_news_comment_added
501 492 comment = Comment.find(2)
502 valid_languages.each do |lang|
503 Setting.default_language = lang.to_s
493 with_each_language_as_default do
504 494 assert Mailer.news_comment_added(comment).deliver
505 495 end
506 496 end
@@ -509,16 +499,14 class MailerTest < ActiveSupport::TestCase
509 499 message = Message.first
510 500 recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
511 501 recipients = recipients.compact.uniq
512 valid_languages.each do |lang|
513 Setting.default_language = lang.to_s
502 with_each_language_as_default do
514 503 assert Mailer.message_posted(message).deliver
515 504 end
516 505 end
517 506
518 507 def test_wiki_content_added
519 508 content = WikiContent.find(1)
520 valid_languages.each do |lang|
521 Setting.default_language = lang.to_s
509 with_each_language_as_default do
522 510 assert_difference 'ActionMailer::Base.deliveries.size' do
523 511 assert Mailer.wiki_content_added(content).deliver
524 512 assert_select_email do
@@ -532,8 +520,7 class MailerTest < ActiveSupport::TestCase
532 520
533 521 def test_wiki_content_updated
534 522 content = WikiContent.find(1)
535 valid_languages.each do |lang|
536 Setting.default_language = lang.to_s
523 with_each_language_as_default do
537 524 assert_difference 'ActionMailer::Base.deliveries.size' do
538 525 assert Mailer.wiki_content_updated(content).deliver
539 526 assert_select_email do
@@ -647,7 +634,6 class MailerTest < ActiveSupport::TestCase
647 634 end
648 635
649 636 def test_mailer_should_not_change_locale
650 Setting.default_language = 'en'
651 637 # Set current language to italian
652 638 set_language_if_valid 'it'
653 639 # Send an email to a french user
@@ -823,4 +809,12 class MailerTest < ActiveSupport::TestCase
823 809 def html_part
824 810 last_email.parts.detect {|part| part.content_type.include?('text/html')}
825 811 end
812
813 def with_each_language_as_default(&block)
814 valid_languages.each do |lang|
815 with_settings :default_language => lang.to_s do
816 yield lang
817 end
818 end
819 end
826 820 end
General Comments 0
You need to be logged in to leave comments. Login now