jro_apps/redmine Commit - r5110:08f44b67f535

Fixed links in new file notification broken by r4051 (#6590)....

Jean-Philippe Lang -

r5110:08f44b67f535

parent child

Context file:

r5110:08f44b67f535

app/models/mailer.rb +2 -2

                 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'

test/unit/mailer_test.rb +7 0

                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo'
                 Setting.protocol = 'http'
+                Setting.plain_text_mail = '0'
               end
               def test_generated_links_in_emails
                 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
                 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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages