Merged r3532 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3646 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
da8624f7c7
commit
b240da3833
2 files changed
+16
-2
No files matched your search
@@ -114,11 +114,11 @@ class Mailer < ActionMailer::Base
|
|||||||
when 'Project'
|
when 'Project'
|
||||||
added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container)
|
added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container)
|
||||||
added_to = "#{l(:label_project)}: #{container}"
|
added_to = "#{l(:label_project)}: #{container}"
|
||||||
recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}
|
recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail}
|
||||||
when 'Version'
|
when 'Version'
|
||||||
added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
|
added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
|
||||||
added_to = "#{l(:label_version)}: #{container.name}"
|
added_to = "#{l(:label_version)}: #{container.name}"
|
||||||
recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}
|
recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail}
|
||||||
when 'Document'
|
when 'Document'
|
||||||
added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
|
added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
|
||||||
added_to = "#{l(:label_document)}: #{container.title}"
|
added_to = "#{l(:label_document)}: #{container.title}"
|
||||||
|
|||||||
@@ -237,6 +237,20 @@ class MailerTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_version_file_added
|
||||||
|
attachements = [ Attachment.find_by_container_type('Version') ]
|
||||||
|
assert Mailer.deliver_attachments_added(attachements)
|
||||||
|
assert_not_nil last_email.bcc
|
||||||
|
assert last_email.bcc.any?
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_project_file_added
|
||||||
|
attachements = [ Attachment.find_by_container_type('Project') ]
|
||||||
|
assert Mailer.deliver_attachments_added(attachements)
|
||||||
|
assert_not_nil last_email.bcc
|
||||||
|
assert last_email.bcc.any?
|
||||||
|
end
|
||||||
|
|
||||||
def test_news_added
|
def test_news_added
|
||||||
news = News.find(:first)
|
news = News.find(:first)
|
||||||
valid_languages.each do |lang|
|
valid_languages.each do |lang|
|
||||||
|
|||||||
Reference in new issue
Block a user