From 8a13595c64e8139be06209aea98396d9798c9bef Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 29 Apr 2011 07:02:26 +0000 Subject: Merged r5230 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5568 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mailer.rb | 4 ++-- test/unit/mailer_test.rb | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 6d6a97246..4dbf5602d 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -114,11 +114,11 @@ class Mailer < ActionMailer::Base added_to_url = '' case container.class.name when 'Project' - added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container) + added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container) added_to = "#{l(:label_project)}: #{container}" recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail} when 'Version' - added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id) + added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project) added_to = "#{l(:label_version)}: #{container.name}" recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail} when 'Document' diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index ae7c06d3e..233a21c4c 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -26,6 +26,7 @@ class MailerTest < ActiveSupport::TestCase ActionMailer::Base.deliveries.clear Setting.host_name = 'mydomain.foo' Setting.protocol = 'http' + Setting.plain_text_mail = '0' end def test_generated_links_in_emails @@ -278,6 +279,9 @@ class MailerTest < ActiveSupport::TestCase assert Mailer.deliver_attachments_added(attachements) assert_not_nil last_email.bcc assert last_email.bcc.any? + assert_select_email do + assert_select "a[href=?]", "http://mydomain.foo/projects/ecookbook/files" + end end def test_project_file_added @@ -285,6 +289,9 @@ class MailerTest < ActiveSupport::TestCase assert Mailer.deliver_attachments_added(attachements) assert_not_nil last_email.bcc assert last_email.bcc.any? + assert_select_email do + assert_select "a[href=?]", "http://mydomain.foo/projects/ecookbook/files" + end end def test_news_added -- cgit v1.2.3