mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Don't change Setting.default_language in Mailer tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@13925 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
ad0937e446
commit
cb8639a7b2
@ -34,11 +34,11 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
Setting.host_name = 'mydomain.foo'
|
Setting.host_name = 'mydomain.foo'
|
||||||
Setting.protocol = 'http'
|
Setting.protocol = 'http'
|
||||||
Setting.plain_text_mail = '0'
|
Setting.plain_text_mail = '0'
|
||||||
|
Setting.default_language = 'en'
|
||||||
User.current = nil
|
User.current = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_generated_links_in_emails
|
def test_generated_links_in_emails
|
||||||
Setting.default_language = 'en'
|
|
||||||
Setting.host_name = 'mydomain.foo'
|
Setting.host_name = 'mydomain.foo'
|
||||||
Setting.protocol = 'https'
|
Setting.protocol = 'https'
|
||||||
|
|
||||||
@ -79,7 +79,6 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_generated_links_with_prefix
|
def test_generated_links_with_prefix
|
||||||
Setting.default_language = 'en'
|
|
||||||
relative_url_root = Redmine::Utils.relative_url_root
|
relative_url_root = Redmine::Utils.relative_url_root
|
||||||
Setting.host_name = 'mydomain.foo/rdm'
|
Setting.host_name = 'mydomain.foo/rdm'
|
||||||
Setting.protocol = 'http'
|
Setting.protocol = 'http'
|
||||||
@ -131,7 +130,6 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_generated_links_with_prefix_and_no_relative_url_root
|
def test_generated_links_with_prefix_and_no_relative_url_root
|
||||||
Setting.default_language = 'en'
|
|
||||||
relative_url_root = Redmine::Utils.relative_url_root
|
relative_url_root = Redmine::Utils.relative_url_root
|
||||||
Setting.host_name = 'mydomain.foo/rdm'
|
Setting.host_name = 'mydomain.foo/rdm'
|
||||||
Setting.protocol = 'http'
|
Setting.protocol = 'http'
|
||||||
@ -346,7 +344,6 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_issue_add_should_include_enabled_fields
|
def test_issue_add_should_include_enabled_fields
|
||||||
Setting.default_language = 'en'
|
|
||||||
issue = Issue.find(2)
|
issue = Issue.find(2)
|
||||||
assert Mailer.deliver_issue_add(issue)
|
assert Mailer.deliver_issue_add(issue)
|
||||||
assert_mail_body_match '* Target version: 1.0', last_email
|
assert_mail_body_match '* Target version: 1.0', last_email
|
||||||
@ -356,7 +353,6 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_issue_add_should_not_include_disabled_fields
|
def test_issue_add_should_not_include_disabled_fields
|
||||||
Setting.default_language = 'en'
|
|
||||||
issue = Issue.find(2)
|
issue = Issue.find(2)
|
||||||
tracker = issue.tracker
|
tracker = issue.tracker
|
||||||
tracker.core_fields -= ['fixed_version_id']
|
tracker.core_fields -= ['fixed_version_id']
|
||||||
@ -371,16 +367,14 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
# test mailer methods for each language
|
# test mailer methods for each language
|
||||||
def test_issue_add
|
def test_issue_add
|
||||||
issue = Issue.find(1)
|
issue = Issue.find(1)
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.deliver_issue_add(issue)
|
assert Mailer.deliver_issue_add(issue)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_issue_edit
|
def test_issue_edit
|
||||||
journal = Journal.find(1)
|
journal = Journal.find(1)
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.deliver_issue_edit(journal)
|
assert Mailer.deliver_issue_edit(journal)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -444,16 +438,14 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
|
|
||||||
def test_document_added
|
def test_document_added
|
||||||
document = Document.find(1)
|
document = Document.find(1)
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.document_added(document).deliver
|
assert Mailer.document_added(document).deliver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_attachments_added
|
def test_attachments_added
|
||||||
attachements = [ Attachment.find_by_container_type('Document') ]
|
attachements = [ Attachment.find_by_container_type('Document') ]
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.attachments_added(attachements).deliver
|
assert Mailer.attachments_added(attachements).deliver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -480,8 +472,7 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
|
|
||||||
def test_news_added
|
def test_news_added
|
||||||
news = News.first
|
news = News.first
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.news_added(news).deliver
|
assert Mailer.news_added(news).deliver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -499,8 +490,7 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
|
|
||||||
def test_news_comment_added
|
def test_news_comment_added
|
||||||
comment = Comment.find(2)
|
comment = Comment.find(2)
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.news_comment_added(comment).deliver
|
assert Mailer.news_comment_added(comment).deliver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -509,16 +499,14 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
message = Message.first
|
message = Message.first
|
||||||
recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
|
recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
|
||||||
recipients = recipients.compact.uniq
|
recipients = recipients.compact.uniq
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert Mailer.message_posted(message).deliver
|
assert Mailer.message_posted(message).deliver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_wiki_content_added
|
def test_wiki_content_added
|
||||||
content = WikiContent.find(1)
|
content = WikiContent.find(1)
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert_difference 'ActionMailer::Base.deliveries.size' do
|
assert_difference 'ActionMailer::Base.deliveries.size' do
|
||||||
assert Mailer.wiki_content_added(content).deliver
|
assert Mailer.wiki_content_added(content).deliver
|
||||||
assert_select_email do
|
assert_select_email do
|
||||||
@ -532,8 +520,7 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
|
|
||||||
def test_wiki_content_updated
|
def test_wiki_content_updated
|
||||||
content = WikiContent.find(1)
|
content = WikiContent.find(1)
|
||||||
valid_languages.each do |lang|
|
with_each_language_as_default do
|
||||||
Setting.default_language = lang.to_s
|
|
||||||
assert_difference 'ActionMailer::Base.deliveries.size' do
|
assert_difference 'ActionMailer::Base.deliveries.size' do
|
||||||
assert Mailer.wiki_content_updated(content).deliver
|
assert Mailer.wiki_content_updated(content).deliver
|
||||||
assert_select_email do
|
assert_select_email do
|
||||||
@ -647,7 +634,6 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_mailer_should_not_change_locale
|
def test_mailer_should_not_change_locale
|
||||||
Setting.default_language = 'en'
|
|
||||||
# Set current language to italian
|
# Set current language to italian
|
||||||
set_language_if_valid 'it'
|
set_language_if_valid 'it'
|
||||||
# Send an email to a french user
|
# Send an email to a french user
|
||||||
@ -823,4 +809,12 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
def html_part
|
def html_part
|
||||||
last_email.parts.detect {|part| part.content_type.include?('text/html')}
|
last_email.parts.detect {|part| part.content_type.include?('text/html')}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def with_each_language_as_default(&block)
|
||||||
|
valid_languages.each do |lang|
|
||||||
|
with_settings :default_language => lang.to_s do
|
||||||
|
yield lang
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user