meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-09 09:01:31 +00:00
Code Issues Releases Wiki Activity

Merged r9896 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9953 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-07-08 12:29:27 +00:00
parent a6252e6c6f
commit 4491d483f4
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/mailer/wiki_content_added.html.erb
View File

@ -1,3 +1,3 @@
<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
:author => h(@wiki_content.author)) %><br />
:author => h(@wiki_content.author)).html_safe %><br />
<em><%=h @wiki_content.comments %></em></p>

2
app/views/mailer/wiki_content_updated.html.erb
View File

@ -1,5 +1,5 @@
<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
:author => h(@wiki_content.author)) %><br />
:author => h(@wiki_content.author)).html_safe %><br />
<em><%=h @wiki_content.comments %></em></p>
<p><%= l(:label_view_diff) %>:<br />

10
test/unit/mailer_test.rb
View File

@ -404,6 +404,11 @@ class MailerTest < ActiveSupport::TestCase
Setting.default_language = lang.to_s
assert_difference 'ActionMailer::Base.deliveries.size' do
assert Mailer.wiki_content_added(content).deliver
assert_select_email do
assert_select 'a[href=?]',
'http://mydomain.foo/projects/ecookbook/wiki/CookBook_documentation',
:text => 'CookBook documentation'
end
end
end
end
@ -414,6 +419,11 @@ class MailerTest < ActiveSupport::TestCase
Setting.default_language = lang.to_s
assert_difference 'ActionMailer::Base.deliveries.size' do
assert Mailer.wiki_content_updated(content).deliver
assert_select_email do
assert_select 'a[href=?]',
'http://mydomain.foo/projects/ecookbook/wiki/CookBook_documentation',
:text => 'CookBook documentation'
end
end
end
end