| @@ -161,7 +161,7 class Mailer < ActionMailer::Base | |||
|
|
161 | 161 | cc((message.root.watcher_recipients + message.board.watcher_recipients).uniq - @recipients) |
|
|
162 | 162 | subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}" |
|
|
163 | 163 | body :message => message, |
|
|
164 | :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root) | |
|
|
164 | :message_url => url_for(message.event_url) | |
|
|
165 | 165 | render_multipart('message_posted', body) |
|
|
166 | 166 | end |
|
|
167 | 167 | |
| @@ -22,6 +22,12 class MailerTest < ActiveSupport::TestCase | |||
|
|
22 | 22 | include ActionController::Assertions::SelectorAssertions |
|
|
23 | 23 | 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 |
|
|
24 | 24 | |
|
|
25 | def setup | |
|
|
26 | ActionMailer::Base.deliveries.clear | |
|
|
27 | Setting.host_name = 'mydomain.foo' | |
|
|
28 | Setting.protocol = 'http' | |
|
|
29 | end | |
|
|
30 | ||
|
|
25 | 31 | def test_generated_links_in_emails |
|
|
26 | 32 | ActionMailer::Base.deliveries.clear |
|
|
27 | 33 | Setting.host_name = 'mydomain.foo' |
| @@ -155,23 +161,29 class MailerTest < ActiveSupport::TestCase | |||
|
|
155 | 161 | end |
|
|
156 | 162 | |
|
|
157 | 163 | def test_message_posted_message_id |
|
|
158 | ActionMailer::Base.deliveries.clear | |
|
|
159 | 164 | message = Message.find(1) |
|
|
160 | 165 | Mailer.deliver_message_posted(message) |
|
|
161 | 166 | mail = ActionMailer::Base.deliveries.last |
|
|
162 | 167 | assert_not_nil mail |
|
|
163 | 168 | assert_equal Mailer.message_id_for(message), mail.message_id |
|
|
164 | 169 | assert_nil mail.references |
|
|
170 | assert_select_email do | |
|
|
171 | # link to the message | |
|
|
172 | assert_select "a[href=?]", "http://mydomain.foo/boards/#{message.board.id}/topics/#{message.id}", :text => message.subject | |
|
|
173 | end | |
|
|
165 | 174 | end |
|
|
166 | 175 | |
|
|
167 | 176 | def test_reply_posted_message_id |
|
|
168 | ActionMailer::Base.deliveries.clear | |
|
|
169 | 177 | message = Message.find(3) |
|
|
170 | 178 | Mailer.deliver_message_posted(message) |
|
|
171 | 179 | mail = ActionMailer::Base.deliveries.last |
|
|
172 | 180 | assert_not_nil mail |
|
|
173 | 181 | assert_equal Mailer.message_id_for(message), mail.message_id |
|
|
174 | 182 | assert_equal Mailer.message_id_for(message.parent), mail.references.first.to_s |
|
|
183 | assert_select_email do | |
|
|
184 | # link to the reply | |
|
|
185 | assert_select "a[href=?]", "http://mydomain.foo/boards/#{message.board.id}/topics/#{message.root.id}?r=#{message.id}#message-#{message.id}", :text => message.subject | |
|
|
186 | end | |
|
|
175 | 187 | end |
|
|
176 | 188 | |
|
|
177 | 189 | context("#issue_add") do |
General Comments 0
You need to be logged in to leave comments.
Login now