jro_apps/redmine Commit - r3344:dab0c07fba56

Fixed: Links in Forum mails should redirect to message, not topic (#4884)....

Jean-Philippe Lang -

r3344:dab0c07fba56

parent child

Context file:

r3344:dab0c07fba56

Collapse all files

app/models/mailer.rb +1 -1

                 cc((message.root.watcher_recipients + message.board.watcher_recipients).uniq - @recipients)
                 subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
                 body :message => message,
-                     :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
+                     :message_url => url_for(message.event_url)
                 render_multipart('message_posted', body)
               end

test/unit/mailer_test.rb +14 -2

               include ActionController::Assertions::SelectorAssertions
               fixtures :projects, :enabled_modules, :issues, :users, :members, :member_roles, :roles, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations, :messages, :boards, :repositories
+              def setup
+                ActionMailer::Base.deliveries.clear
+                Setting.host_name = 'mydomain.foo'
+                Setting.protocol = 'http'
+              end
               def test_generated_links_in_emails
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo'
               end
               def test_message_posted_message_id
-                ActionMailer::Base.deliveries.clear
                 message = Message.find(1)
                 Mailer.deliver_message_posted(message)
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_nil mail.references
+                assert_select_email do
+                  # link to the message
+                  assert_select "a[href=?]", "http://mydomain.foo/boards/#{message.board.id}/topics/#{message.id}", :text => message.subject
+                end
               end
               def test_reply_posted_message_id
-                ActionMailer::Base.deliveries.clear
                 message = Message.find(3)
                 Mailer.deliver_message_posted(message)
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_equal Mailer.message_id_for(message.parent), mail.references.first.to_s
+                assert_select_email do
+                  # link to the reply
+                  assert_select "a[href=?]", "http://mydomain.foo/boards/#{message.board.id}/topics/#{message.root.id}?r=#{message.id}#message-#{message.id}", :text => message.subject
+                end
               end
               context("#issue_add") do

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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