##// END OF EJS Templates
Merged r15587 and r15588 (#23180)....
Jean-Philippe Lang -
r15237:e75926314f96
parent child
Show More
@@ -1,3 +1,3
1 <%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
1 <%= l(:text_issue_added, :id => link_to("##{@issue.id}", @issue_url), :author => h(@issue.author)).html_safe %>
2 <hr />
2 <hr />
3 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
3 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
@@ -1,7 +1,7
1 <% if @journal.private_notes? %>
1 <% if @journal.private_notes? %>
2 (<%= l(:field_private_notes) %>)
2 (<%= l(:field_private_notes) %>)
3 <% end %>
3 <% end %>
4 <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
4 <%= l(:text_issue_updated, :id => link_to("##{@issue.id}", @issue_url), :author => h(@journal.user)).html_safe %>
5
5
6 <ul>
6 <ul>
7 <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
7 <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
@@ -45,6 +45,10 class MailerTest < ActiveSupport::TestCase
45 assert_not_nil mail
45 assert_not_nil mail
46
46
47 assert_select_email do
47 assert_select_email do
48 # link to the main ticket on issue id
49 assert_select 'a[href=?]',
50 'https://mydomain.foo/issues/2#change-3',
51 :text => '#2'
48 # link to the main ticket
52 # link to the main ticket
49 assert_select 'a[href=?]',
53 assert_select 'a[href=?]',
50 'https://mydomain.foo/issues/2#change-3',
54 'https://mydomain.foo/issues/2#change-3',
General Comments 0
You need to be logged in to leave comments. Login now