jro_apps/redmine Commit - r11849:fd1b06070559

Fixed that standard fields disabled still appear in email notifications (#14584)....

Jean-Philippe Lang -

r11849:fd1b06070559

parent child

Context file:

r11849:fd1b06070559

Collapse all files

app/helpers/issues_helper.rb +22 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module IssuesHelper
               include ApplicationHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.all
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :tracker_id => issue.tracker,
                   :parent_issue_id => issue
                 }
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   html = ''.html_safe
                   blank = content_tag('th', '') + content_tag('td', '')
                   size.times do |i|
                     left = @left[i] || blank
                     right = @right[i] || blank
                     html << content_tag('tr', left + right)
                   end
                   html
                 end
                 def cells(label, text, options={})
                   content_tag('th', "#{label}:", options) + content_tag('td', text, options)
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 ordered_values = []
                 half = (values.size / 2.0).ceil
                 half.times do |i|
                   ordered_values << values[i]
                   ordered_values << values[i + half]
                 end
                 s = "<tr>\n"
                 n = 0
                 ordered_values.compact.each do |value|
                   s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                   s << "\t<th>#{ h(value.custom_field.name) }:</th><td>#{ simple_format_without_paragraph(h(show_value(value))) }</td>\n"
                   n += 1
                 end
                 s << "</tr>\n"
                 s.html_safe
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
                 if descendant_count > 0
                   issues.each do |issue|
                     next if issue.root?
                     issues.each do |other_issue|
                       descendant_count -= 1 if issue.is_descendant_of?(other_issue)
                     end
                   end
                   if descendant_count > 0
                     message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                   end
                 end
                 message
               end
               def sidebar_queries
                 unless @sidebar_queries
                   @sidebar_queries = IssueQuery.visible.
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
                     all
                 end
                 @sidebar_queries
               end
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               def render_sidebar_queries
                 out = ''.html_safe
                 out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
                 out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
                 out
               end
+              def email_issue_attributes(issue, user)
+                items = []
+                %w(author status priority assigned_to category fixed_version).each do |attribute|
+                  unless issue.disabled_core_fields.include?(attribute+"_id")
+                    items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
+                  end
+                end
+                issue.visible_custom_field_values(user).each do |value|
+                  items << "#{value.custom_field.name}: #{show_value(value)}"
+                end
+                items
+              end
+              def render_email_issue_attributes(issue, user, html=false)
+                items = email_issue_attributes(issue, user)
+                if html
+                  content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
+                else
+                  items.map{|s| "* #{s}"}.join("\n")
+                end
+              end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field_id = detail.prop_key
                     field = CustomField.find_by_id(field_id)
                     if field && field.multiple?
                       values_by_field[field_id] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field_id][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field_id][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 values_by_field.each do |field_id, changes|
                   detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
                   if changes[:added].any?
                     detail.value = changes[:added]
                     strings << show_detail(detail, no_html, options)
                   elsif changes[:deleted].any?
                     detail.old_value = changes[:deleted]
                     strings << show_detail(detail, no_html, options)
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   end
                 when 'cf'
                   custom_field = CustomField.find_by_id(detail.prop_key)
                   if custom_field
                     multiple = custom_field.multiple?
                     label = custom_field.name
                     value = format_value(detail.value, custom_field.field_format) if detail.value
                     old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue))
                   end
                   label = l(detail.prop_key.to_sym)
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && atta.is_text?
                       value += link_to(
                                    image_tag('magnifier.png'),
                                    :controller => 'attachments', :action => 'show',
                                    :id => atta, :filename => atta.filename
                                  )
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if detail.property == 'attr' && detail.prop_key == 'description'
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                        :detail_id => detail.id, :only_path => options[:only_path]},
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 association = Issue.reflect_on_association(field.to_sym)
                 if association
                   record = association.class_name.constantize.find_by_id(id)
                   if record
                     record.name.force_encoding('UTF-8') if record.name.respond_to?(:force_encoding)
                     return record.name
                   end
                 end
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/views/mailer/_issue.html.erb +1 -11

             <h1><%= link_to(h("#{issue.tracker.name} ##{issue.id}: #{issue.subject}"), issue_url) %></h1>
-            <ul>
+            <%= render_email_issue_attributes(issue, users.first, true) %>
-            <li><%=l(:field_author)%>: <%=h issue.author %></li>
-            <li><%=l(:field_status)%>: <%=h issue.status %></li>
-            <li><%=l(:field_priority)%>: <%=h issue.priority %></li>
-            <li><%=l(:field_assigned_to)%>: <%=h issue.assigned_to %></li>
-            <li><%=l(:field_category)%>: <%=h issue.category %></li>
-            <li><%=l(:field_fixed_version)%>: <%=h issue.fixed_version %></li>
-            <% issue.visible_custom_field_values(users.first).each do |c| %>
-              <li><%=h c.custom_field.name %>: <%=h show_value(c) %></li>
-            <% end %>
-            </ul>
             <%= textilizable(issue, :description, :only_path => false) %>
             <% if issue.attachments.any? %>
               <fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend>
               <% issue.attachments.each do |attachment| %>
                 <%= link_to_attachment attachment, :download => true, :only_path => false %>
                 (<%= number_to_human_size(attachment.filesize) %>)<br />
               <% end %>
               </fieldset>
             <% end %>

app/views/mailer/_issue.text.erb +1 -8

             <%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %>
             <%= issue_url %>
-            * <%=l(:field_author)%>: <%= issue.author %>
+            <%= render_email_issue_attributes(issue, users.first) %>
-            * <%=l(:field_status)%>: <%= issue.status %>
-            * <%=l(:field_priority)%>: <%= issue.priority %>
-            * <%=l(:field_assigned_to)%>: <%= issue.assigned_to %>
-            * <%=l(:field_category)%>: <%= issue.category %>
-            * <%=l(:field_fixed_version)%>: <%= issue.fixed_version %>
-            <% issue.visible_custom_field_values(users.first).each do |c| %>* <%= c.custom_field.name %>: <%= show_value(c) %>
-            <% end -%>
             ----------------------------------------
             <%= issue.description %>
             <% if issue.attachments.any? -%>
             ---<%= l(:label_attachment_plural).ljust(37, '-') %>
             <% issue.attachments.each do |attachment| -%>
             <%= attachment.filename %> (<%= number_to_human_size(attachment.filesize) %>)
             <% end -%>
             <% end -%>

test/unit/mailer_test.rb +23 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class MailerTest < ActiveSupport::TestCase
               include Redmine::I18n
               include ActionDispatch::Assertions::SelectorAssertions
               fixtures :projects, :enabled_modules, :issues, :users, :members,
                        :member_roles, :roles, :documents, :attachments, :news,
                        :tokens, :journals, :journal_details, :changesets,
                        :trackers, :projects_trackers,
                        :issue_statuses, :enumerations, :messages, :boards, :repositories,
                        :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions,
                        :versions,
                        :comments
               def setup
                 ActionMailer::Base.deliveries.clear
                 Setting.host_name = 'mydomain.foo'
                 Setting.protocol = 'http'
                 Setting.plain_text_mail = '0'
               end
               def test_generated_links_in_emails
                 Setting.default_language = 'en'
                 Setting.host_name = 'mydomain.foo'
                 Setting.protocol = 'https'
                 journal = Journal.find(3)
                 assert Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_not_nil mail
                 assert_select_email do
                   # link to the main ticket
                   assert_select 'a[href=?]',
                                 'https://mydomain.foo/issues/2#change-3',
                                 :text => 'Feature request #2: Add ingredients categories'
                   # link to a referenced ticket
                   assert_select 'a[href=?][title=?]',
                                 'https://mydomain.foo/issues/1',
                                 'Can&#x27;t print recipes (New)',
                                 :text => '#1'
                   # link to a changeset
                   assert_select 'a[href=?][title=?]',
                                 'https://mydomain.foo/projects/ecookbook/repository/revisions/2',
                                 'This commit fixes #1, #2 and references #1 &amp; #3',
                                 :text => 'r2'
                   # link to a description diff
                   assert_select 'a[href=?][title=?]',
                                 'https://mydomain.foo/journals/diff/3?detail_id=4',
                                 'View differences',
                                 :text => 'diff'
                   # link to an attachment
                   assert_select 'a[href=?]',
                                 'https://mydomain.foo/attachments/download/4/source.rb',
                                 :text => 'source.rb'
                 end
               end
               def test_generated_links_with_prefix
                 Setting.default_language = 'en'
                 relative_url_root = Redmine::Utils.relative_url_root
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
                 journal = Journal.find(3)
                 assert Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_not_nil mail
                 assert_select_email do
                   # link to the main ticket
                   assert_select 'a[href=?]',
                                 'http://mydomain.foo/rdm/issues/2#change-3',
                                 :text => 'Feature request #2: Add ingredients categories'
                   # link to a referenced ticket
                   assert_select 'a[href=?][title=?]',
                                 'http://mydomain.foo/rdm/issues/1',
                                 'Can&#x27;t print recipes (New)',
                                 :text => '#1'
                   # link to a changeset
                   assert_select 'a[href=?][title=?]',
                                 'http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2',
                                 'This commit fixes #1, #2 and references #1 &amp; #3',
                                 :text => 'r2'
                   # link to a description diff
                   assert_select 'a[href=?][title=?]',
                                 'http://mydomain.foo/rdm/journals/diff/3?detail_id=4',
                                 'View differences',
                                 :text => 'diff'
                   # link to an attachment
                   assert_select 'a[href=?]',
                                 'http://mydomain.foo/rdm/attachments/download/4/source.rb',
                                 :text => 'source.rb'
                 end
               end
               def test_generated_links_with_prefix_and_no_relative_url_root
                 Setting.default_language = 'en'
                 relative_url_root = Redmine::Utils.relative_url_root
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
                 Redmine::Utils.relative_url_root = nil
                 journal = Journal.find(3)
                 assert Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_not_nil mail
                 assert_select_email do
                   # link to the main ticket
                   assert_select 'a[href=?]',
                                 'http://mydomain.foo/rdm/issues/2#change-3',
                                 :text => 'Feature request #2: Add ingredients categories'
                   # link to a referenced ticket
                   assert_select 'a[href=?][title=?]',
                                 'http://mydomain.foo/rdm/issues/1',
                                 'Can&#x27;t print recipes (New)',
                                 :text => '#1'
                   # link to a changeset
                   assert_select 'a[href=?][title=?]',
                                 'http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2',
                                 'This commit fixes #1, #2 and references #1 &amp; #3',
                                 :text => 'r2'
                   # link to a description diff
                   assert_select 'a[href=?][title=?]',
                                 'http://mydomain.foo/rdm/journals/diff/3?detail_id=4',
                                 'View differences',
                                 :text => 'diff'
                   # link to an attachment
                   assert_select 'a[href=?]',
                                 'http://mydomain.foo/rdm/attachments/download/4/source.rb',
                                 :text => 'source.rb'
                 end
               ensure
                 # restore it
                 Redmine::Utils.relative_url_root = relative_url_root
               end
               def test_email_headers
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
                 mail = last_email
                 assert_not_nil mail
                 assert_equal 'OOF', mail.header['X-Auto-Response-Suppress'].to_s
                 assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s
                 assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s
               end
               def test_email_headers_should_include_sender
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
                 mail = last_email
                 assert_equal issue.author.login, mail.header['X-Redmine-Sender'].to_s
               end
               def test_plain_text_mail
                 Setting.plain_text_mail = 1
                 journal = Journal.find(2)
                 Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_equal "text/plain; charset=UTF-8", mail.content_type
                 assert_equal 0, mail.parts.size
                 assert !mail.encoded.include?('href')
               end
               def test_html_mail
                 Setting.plain_text_mail = 0
                 journal = Journal.find(2)
                 Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_equal 2, mail.parts.size
                 assert mail.encoded.include?('href')
               end
               def test_from_header
                 with_settings :mail_from => 'redmine@example.net' do
                   Mailer.test_email(User.find(1)).deliver
                 end
                 mail = last_email
                 assert_equal 'redmine@example.net', mail.from_addrs.first
               end
               def test_from_header_with_phrase
                 with_settings :mail_from => 'Redmine app <redmine@example.net>' do
                   Mailer.test_email(User.find(1)).deliver
                 end
                 mail = last_email
                 assert_equal 'redmine@example.net', mail.from_addrs.first
                 assert_equal 'Redmine app <redmine@example.net>', mail.header['From'].to_s
               end
               def test_should_not_send_email_without_recipient
                 news = News.first
                 user = news.author
                 # Remove members except news author
                 news.project.memberships.each {|m| m.destroy unless m.user == user}
                 user.pref.no_self_notified = false
                 user.pref.save
                 User.current = user
                 Mailer.news_added(news.reload).deliver
                 assert_equal 1, last_email.bcc.size
                 # nobody to notify
                 user.pref.no_self_notified = true
                 user.pref.save
                 User.current = user
                 ActionMailer::Base.deliveries.clear
                 Mailer.news_added(news.reload).deliver
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_issue_add_message_id
                 issue = Issue.find(2)
                 Mailer.deliver_issue_add(issue)
                 mail = last_email
                 assert_match /^redmine\.issue-2\.20060719190421\.[a-f0-9]+@example\.net/, mail.message_id
                 assert_include "redmine.issue-2.20060719190421@example.net", mail.references
               end
               def test_issue_edit_message_id
                 journal = Journal.find(3)
                 journal.issue = Issue.find(2)
                 Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_match /^redmine\.journal-3\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
                 assert_include "redmine.issue-2.20060719190421@example.net", mail.references
                 assert_select_email do
                   # link to the update
                   assert_select "a[href=?]",
                                 "http://mydomain.foo/issues/#{journal.journalized_id}#change-#{journal.id}"
                 end
               end
               def test_message_posted_message_id
                 message = Message.find(1)
                 Mailer.message_posted(message).deliver
                 mail = last_email
                 assert_match /^redmine\.message-1\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
                 assert_include "redmine.message-1.20070512151532@example.net", 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
                 message = Message.find(3)
                 Mailer.message_posted(message).deliver
                 mail = last_email
                 assert_match /^redmine\.message-3\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
                 assert_include "redmine.message-1.20070512151532@example.net", mail.references
                 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
               test "#issue_add should notify project members" do
                 issue = Issue.find(1)
                 assert Mailer.deliver_issue_add(issue)
                 assert last_email.bcc.include?('dlopper@somenet.foo')
               end
               test "#issue_add should not notify project members that are not allow to view the issue" do
                 issue = Issue.find(1)
                 Role.find(2).remove_permission!(:view_issues)
                 assert Mailer.deliver_issue_add(issue)
                 assert !last_email.bcc.include?('dlopper@somenet.foo')
               end
               test "#issue_add should notify issue watchers" do
                 issue = Issue.find(1)
                 user = User.find(9)
                 # minimal email notification options
                 user.pref.no_self_notified = '1'
                 user.pref.save
                 user.mail_notification = false
                 user.save
                 Watcher.create!(:watchable => issue, :user => user)
                 assert Mailer.deliver_issue_add(issue)
                 assert last_email.bcc.include?(user.mail)
               end
               test "#issue_add should not notify watchers not allowed to view the issue" do
                 issue = Issue.find(1)
                 user = User.find(9)
                 Watcher.create!(:watchable => issue, :user => user)
                 Role.non_member.remove_permission!(:view_issues)
                 assert Mailer.deliver_issue_add(issue)
                 assert !last_email.bcc.include?(user.mail)
               end
+              def test_issue_add_should_include_enabled_fields
+                Setting.default_language = 'en'
+                issue = Issue.find(2)
+                assert Mailer.deliver_issue_add(issue)
+                assert_mail_body_match '* Target version: 1.0', last_email
+                assert_select_email do
+                  assert_select 'li', :text => 'Target version: 1.0'
+                end
+              end
+              def test_issue_add_should_not_include_disabled_fields
+                Setting.default_language = 'en'
+                issue = Issue.find(2)
+                tracker = issue.tracker
+                tracker.core_fields -= ['fixed_version_id']
+                tracker.save!
+                assert Mailer.deliver_issue_add(issue)
+                assert_mail_body_no_match 'Target version', last_email
+                assert_select_email do
+                  assert_select 'li', :text => /Target version/, :count => 0
+                end
+              end
               # test mailer methods for each language
               def test_issue_add
                 issue = Issue.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_issue_add(issue)
                 end
               end
               def test_issue_edit
                 journal = Journal.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_issue_edit(journal)
                 end
               end
               def test_issue_edit_should_send_private_notes_to_users_with_permission_only
                 journal = Journal.find(1)
                 journal.private_notes = true
                 journal.save!
                 Role.find(2).add_permission! :view_private_notes
                 Mailer.deliver_issue_edit(journal)
                 assert_equal %w(dlopper@somenet.foo jsmith@somenet.foo), ActionMailer::Base.deliveries.last.bcc.sort
                 Role.find(2).remove_permission! :view_private_notes
                 Mailer.deliver_issue_edit(journal)
                 assert_equal %w(jsmith@somenet.foo), ActionMailer::Base.deliveries.last.bcc.sort
               end
               def test_issue_edit_should_send_private_notes_to_watchers_with_permission_only
                 Issue.find(1).set_watcher(User.find_by_login('someone'))
                 journal = Journal.find(1)
                 journal.private_notes = true
                 journal.save!
                 Role.non_member.add_permission! :view_private_notes
                 Mailer.deliver_issue_edit(journal)
                 assert_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort
                 Role.non_member.remove_permission! :view_private_notes
                 Mailer.deliver_issue_edit(journal)
                 assert_not_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort
               end
               def test_issue_edit_should_mark_private_notes
                 journal = Journal.find(2)
                 journal.private_notes = true
                 journal.save!
                 with_settings :default_language => 'en' do
                   Mailer.deliver_issue_edit(journal)
                 end
                 assert_mail_body_match '(Private notes)', last_email
               end
               def test_issue_edit_with_relation_should_notify_users_who_can_see_the_related_issue
                 issue = Issue.generate!
                 private_issue = Issue.generate!(:is_private => true)
                 IssueRelation.create!(:issue_from => issue, :issue_to => private_issue, :relation_type => 'relates')
                 issue.reload
                 assert_equal 1, issue.journals.size
                 journal = issue.journals.first
                 ActionMailer::Base.deliveries.clear
                 Mailer.deliver_issue_edit(journal)
                 last_email.bcc.each do |email|
                   user = User.find_by_mail(email)
                   assert private_issue.visible?(user), "Issue was not visible to #{user}"
                 end
               end
               def test_document_added
                 document = Document.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.document_added(document).deliver
                 end
               end
               def test_attachments_added
                 attachements = [ Attachment.find_by_container_type('Document') ]
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.attachments_added(attachements).deliver
                 end
               end
               def test_version_file_added
                 attachements = [ Attachment.find_by_container_type('Version') ]
                 assert Mailer.attachments_added(attachements).deliver
                 assert_not_nil last_email.bcc
                 assert last_email.bcc.any?
                 assert_select_email do
                   assert_select "a[href=?]", "http://mydomain.foo/projects/ecookbook/files"
                 end
               end
               def test_project_file_added
                 attachements = [ Attachment.find_by_container_type('Project') ]
                 assert Mailer.attachments_added(attachements).deliver
                 assert_not_nil last_email.bcc
                 assert last_email.bcc.any?
                 assert_select_email do
                   assert_select "a[href=?]", "http://mydomain.foo/projects/ecookbook/files"
                 end
               end
               def test_news_added
                 news = News.first
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.news_added(news).deliver
                 end
               end
               def test_news_comment_added
                 comment = Comment.find(2)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.news_comment_added(comment).deliver
                 end
               end
               def test_message_posted
                 message = Message.first
                 recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
                 recipients = recipients.compact.uniq
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.message_posted(message).deliver
                 end
               end
               def test_wiki_content_added
                 content = WikiContent.find(1)
                 valid_languages.each do |lang|
                   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
               def test_wiki_content_updated
                 content = WikiContent.find(1)
                 valid_languages.each do |lang|
                   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
               def test_account_information
                 user = User.find(2)
                 valid_languages.each do |lang|
                   user.update_attribute :language, lang.to_s
                   user.reload
                   assert Mailer.account_information(user, 'pAsswORd').deliver
                 end
               end
               def test_lost_password
                 token = Token.find(2)
                 valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
                   token.reload
                   assert Mailer.lost_password(token).deliver
                 end
               end
               def test_register
                 token = Token.find(1)
                 Setting.host_name = 'redmine.foo'
                 Setting.protocol = 'https'
                 valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
                   token.reload
                   ActionMailer::Base.deliveries.clear
                   assert Mailer.register(token).deliver
                   mail = last_email
                   assert_select_email do
                     assert_select "a[href=?]",
                                   "https://redmine.foo/account/activate?token=#{token.value}",
                                   :text => "https://redmine.foo/account/activate?token=#{token.value}"
                   end
                 end
               end
               def test_test
                 user = User.find(1)
                 valid_languages.each do |lang|
                   user.update_attribute :language, lang.to_s
                   assert Mailer.test_email(user).deliver
                 end
               end
               def test_reminders
                 Mailer.reminders(:days => 42)
                 assert_equal 1, ActionMailer::Base.deliveries.size
                 mail = last_email
                 assert mail.bcc.include?('dlopper@somenet.foo')
                 assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail
                 assert_equal '1 issue(s) due in the next 42 days', mail.subject
               end
               def test_reminders_should_not_include_closed_issues
                 with_settings :default_language => 'en' do
                   Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 5,
                                   :subject => 'Closed issue', :assigned_to_id => 3,
                                   :due_date => 5.days.from_now,
                                   :author_id => 2)
                   ActionMailer::Base.deliveries.clear
                   Mailer.reminders(:days => 42)
                   assert_equal 1, ActionMailer::Base.deliveries.size
                   mail = last_email
                   assert mail.bcc.include?('dlopper@somenet.foo')
                   assert_mail_body_no_match 'Closed issue', mail
                 end
               end
               def test_reminders_for_users
                 Mailer.reminders(:days => 42, :users => ['5'])
                 assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper
                 Mailer.reminders(:days => 42, :users => ['3'])
                 assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper
                 mail = last_email
                 assert mail.bcc.include?('dlopper@somenet.foo')
                 assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail
               end
               def test_reminder_should_include_issues_assigned_to_groups
                 with_settings :default_language => 'en' do
                   group = Group.generate!
                   group.users << User.find(2)
                   group.users << User.find(3)
                   Issue.create!(:project_id => 1, :tracker_id => 1, :status_id => 1,
                                   :subject => 'Assigned to group', :assigned_to => group,
                                   :due_date => 5.days.from_now,
                                   :author_id => 2)
                   ActionMailer::Base.deliveries.clear
                   Mailer.reminders(:days => 7)
                   assert_equal 2, ActionMailer::Base.deliveries.size
                   assert_equal %w(dlopper@somenet.foo jsmith@somenet.foo), ActionMailer::Base.deliveries.map(&:bcc).flatten.sort
                   ActionMailer::Base.deliveries.each do |mail|
                     assert_mail_body_match 'Assigned to group', mail
                   end
                 end
               end
               def test_mailer_should_not_change_locale
                 Setting.default_language = 'en'
                 # Set current language to italian
                 set_language_if_valid 'it'
                 # Send an email to a french user
                 user = User.find(1)
                 user.language = 'fr'
                 Mailer.account_activated(user).deliver
                 mail = last_email
                 assert_mail_body_match 'Votre compte', mail
                 assert_equal :it, current_language
               end
               def test_with_deliveries_off
                 Mailer.with_deliveries false do
                   Mailer.test_email(User.find(1)).deliver
                 end
                 assert ActionMailer::Base.deliveries.empty?
                 # should restore perform_deliveries
                 assert ActionMailer::Base.perform_deliveries
               end
               def test_layout_should_include_the_emails_header
                 with_settings :emails_header => "*Header content*" do
                   with_settings :plain_text_mail => 0 do
                     assert Mailer.test_email(User.find(1)).deliver
                     assert_select_email do
                       assert_select ".header" do
                         assert_select "strong", :text => "Header content"
                       end
                     end
                   end
                   with_settings :plain_text_mail => 1 do
                     assert Mailer.test_email(User.find(1)).deliver
                     mail = last_email
                     assert_not_nil mail
                     assert_include "*Header content*", mail.body.decoded
                   end
                 end
               end
               def test_layout_should_not_include_empty_emails_header
                 with_settings :emails_header => "", :plain_text_mail => 0 do
                   assert Mailer.test_email(User.find(1)).deliver
                   assert_select_email do
                     assert_select ".header", false
                   end
                 end
               end
               def test_layout_should_include_the_emails_footer
                 with_settings :emails_footer => "*Footer content*" do
                   with_settings :plain_text_mail => 0 do
                     assert Mailer.test_email(User.find(1)).deliver
                     assert_select_email do
                       assert_select ".footer" do
                         assert_select "strong", :text => "Footer content"
                       end
                     end
                   end
                   with_settings :plain_text_mail => 1 do
                     assert Mailer.test_email(User.find(1)).deliver
                     mail = last_email
                     assert_not_nil mail
                     assert_include "\n-- \n", mail.body.decoded
                     assert_include "*Footer content*", mail.body.decoded
                   end
                 end
               end
               def test_layout_should_not_include_empty_emails_footer
                 with_settings :emails_footer => "" do
                   with_settings :plain_text_mail => 0 do
                     assert Mailer.test_email(User.find(1)).deliver
                     assert_select_email do
                       assert_select ".footer", false
                     end
                   end
                   with_settings :plain_text_mail => 1 do
                     assert Mailer.test_email(User.find(1)).deliver
                     mail = last_email
                     assert_not_nil mail
                     assert_not_include "\n-- \n", mail.body.decoded
                   end
                 end
               end
               def test_should_escape_html_templates_only
                 Issue.generate!(:project_id => 1, :tracker_id => 1, :subject => 'Subject with a <tag>')
                 mail = last_email
                 assert_equal 2, mail.parts.size
                 assert_include '<tag>', text_part.body.encoded
                 assert_include '&lt;tag&gt;', html_part.body.encoded
               end
               def test_should_raise_delivery_errors_when_raise_delivery_errors_is_true
                 mail = Mailer.test_email(User.find(1))
                 mail.delivery_method.stubs(:deliver!).raises(Exception.new("delivery error"))
                 ActionMailer::Base.raise_delivery_errors = true
                 assert_raise Exception, "delivery error" do
                   mail.deliver
                 end
               ensure
                 ActionMailer::Base.raise_delivery_errors = false
               end
               def test_should_log_delivery_errors_when_raise_delivery_errors_is_false
                 mail = Mailer.test_email(User.find(1))
                 mail.delivery_method.stubs(:deliver!).raises(Exception.new("delivery error"))
                 Rails.logger.expects(:error).with("Email delivery error: delivery error")
                 ActionMailer::Base.raise_delivery_errors = false
                 assert_nothing_raised do
                   mail.deliver
                 end
               end
               private
               def last_email
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 mail
               end
               def text_part
                 last_email.parts.detect {|part| part.content_type.include?('text/plain')}
               end
               def html_part
                 last_email.parts.detect {|part| part.content_type.include?('text/html')}
               end
             end

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