kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3458 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-02-20 10:07:53 +00:00
parent 08d7c5bfb4
commit dab0c07fba
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mailer.rb
View File

@ -161,7 +161,7 @@ class Mailer < ActionMailer::Base
cc((message.root.watcher_recipients + message.board.watcher_recipients).uniq - @recipients) 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}" subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
body :message => message, 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) render_multipart('message_posted', body)
end end

16
test/unit/mailer_test.rb
View File

@ -22,6 +22,12 @@ class MailerTest < ActiveSupport::TestCase
include ActionController::Assertions::SelectorAssertions 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 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 def test_generated_links_in_emails
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
Setting.host_name = 'mydomain.foo' Setting.host_name = 'mydomain.foo'
@ -155,23 +161,29 @@ class MailerTest < ActiveSupport::TestCase
end end
def test_message_posted_message_id def test_message_posted_message_id
ActionMailer::Base.deliveries.clear
message = Message.find(1) message = Message.find(1)
Mailer.deliver_message_posted(message) Mailer.deliver_message_posted(message)
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
assert_not_nil mail assert_not_nil mail
assert_equal Mailer.message_id_for(message), mail.message_id assert_equal Mailer.message_id_for(message), mail.message_id
assert_nil mail.references 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 end
def test_reply_posted_message_id def test_reply_posted_message_id
ActionMailer::Base.deliveries.clear
message = Message.find(3) message = Message.find(3)
Mailer.deliver_message_posted(message) Mailer.deliver_message_posted(message)
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
assert_not_nil mail assert_not_nil mail
assert_equal Mailer.message_id_for(message), mail.message_id assert_equal Mailer.message_id_for(message), mail.message_id
assert_equal Mailer.message_id_for(message.parent), mail.references.first.to_s 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 end
context("#issue_add") do context("#issue_add") do