jro_apps/redmine Commit - r8960:d862843c9d58

Renamed Mailer#test to Mailer#test_email....

Jean-Philippe Lang -

r8960:d862843c9d58

parent child

Context file:

r8960:d862843c9d58

Collapse all files

app/controllers/admin_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             class AdminController < ApplicationController
               layout 'admin'
               menu_item :projects, :only => :projects
               menu_item :plugins, :only => :plugins
               menu_item :info, :only => :info
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
                 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
               end
               def projects
                 @status = params[:status] || 1
                 scope = Project.status(@status)
                 scope = scope.like(params[:name]) if params[:name].present?
                 @projects = scope.all(:order => 'lft')
                 render :action => "projects", :layout => false if request.xhr?
               end
               def plugins
                 @plugins = Redmine::Plugin.all
               end
               # Loads the default configuration
               # (roles, trackers, statuses, workflow, enumerations)
               def default_configuration
                 if request.post?
                   begin
                     Redmine::DefaultData::Loader::load(params[:lang])
                     flash[:notice] = l(:notice_default_data_loaded)
                   rescue Exception => e
                     flash[:error] = l(:error_can_t_load_default_data, e.message)
                   end
                 end
                 redirect_to :action => 'index'
               end
               def test_email
                 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
                 # Force ActionMailer to raise delivery errors so we can catch it
                 ActionMailer::Base.raise_delivery_errors = true
                 begin
-                  @test = Mailer.deliver_test(User.current)
+                  @test = Mailer.deliver_test_email(User.current)
                   flash[:notice] = l(:notice_email_sent, User.current.mail)
                 rescue Exception => e
                   flash[:error] = l(:notice_email_error, e.message)
                 end
                 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
                 redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
               end
               def info
                 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
                 @checklist = [
                   [:text_default_administrator_account_changed,
                       User.find(:first,
                                 :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
                   [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
                   [:text_plugin_assets_writable,   File.writable?(Redmine::Plugin.public_directory)],
                   [:text_rmagick_available,        Object.const_defined?(:Magick)]
                 ]
               end
             end

app/models/mailer.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             class Mailer < ActionMailer::Base
               layout 'mailer'
               helper :application
               helper :issues
               helper :custom_fields
               include ActionController::UrlWriter
               include Redmine::I18n
               def self.default_url_options
                 h = Setting.host_name
                 h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
                 { :host => h, :protocol => Setting.protocol }
               end
               # Builds a tmail object used to email recipients of the added issue.
               #
               # Example:
               #   issue_add(issue) => tmail object
               #   Mailer.deliver_issue_add(issue) => sends an email to issue recipients
               def issue_add(issue)
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id issue
                 @author = issue.author
                 recipients issue.recipients
                 cc(issue.watcher_recipients - @recipients)
                 subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
                 body :issue => issue,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
                 render_multipart('issue_add', body)
               end
               # Builds a tmail object used to email recipients of the edited issue.
               #
               # Example:
               #   issue_edit(journal) => tmail object
               #   Mailer.deliver_issue_edit(journal) => sends an email to issue recipients
               def issue_edit(journal)
                 issue = journal.journalized.reload
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id journal
                 references issue
                 @author = journal.user
                 recipients issue.recipients
                 # Watchers in cc
                 cc(issue.watcher_recipients - @recipients)
                 s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
                 s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
                 s << issue.subject
                 subject s
                 body :issue => issue,
                      :journal => journal,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
                 render_multipart('issue_edit', body)
               end
               def reminder(user, issues, days)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_reminder, :count => issues.size, :days => days)
                 body :issues => issues,
                      :days => days,
                      :issues_url => url_for(:controller => 'issues', :action => 'index',
                                             :set_filter => 1, :assigned_to_id => user.id,
                                             :sort => 'due_date:asc')
                 render_multipart('reminder', body)
               end
               # Builds a tmail object used to email users belonging to the added document's project.
               #
               # Example:
               #   document_added(document) => tmail object
               #   Mailer.deliver_document_added(document) => sends an email to the document's project recipients
               def document_added(document)
                 redmine_headers 'Project' => document.project.identifier
                 recipients document.recipients
                 subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
                 body :document => document,
                      :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
                 render_multipart('document_added', body)
               end
               # Builds a tmail object used to email recipients of a project when an attachements are added.
               #
               # Example:
               #   attachments_added(attachments) => tmail object
               #   Mailer.deliver_attachments_added(attachments) => sends an email to the project's recipients
               def attachments_added(attachments)
                 container = attachments.first.container
                 added_to = ''
                 added_to_url = ''
                 case container.class.name
                 when 'Project'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
                   added_to = "#{l(:label_project)}: #{container}"
                   recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
                 when 'Version'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
                   added_to = "#{l(:label_version)}: #{container.name}"
                   recipients container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
                 when 'Document'
                   added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
                   added_to = "#{l(:label_document)}: #{container.title}"
                   recipients container.recipients
                 end
                 redmine_headers 'Project' => container.project.identifier
                 subject "[#{container.project.name}] #{l(:label_attachment_new)}"
                 body :attachments => attachments,
                      :added_to => added_to,
                      :added_to_url => added_to_url
                 render_multipart('attachments_added', body)
               end
               # Builds a tmail object used to email recipients of a news' project when a news item is added.
               #
               # Example:
               #   news_added(news) => tmail object
               #   Mailer.deliver_news_added(news) => sends an email to the news' project recipients
               def news_added(news)
                 redmine_headers 'Project' => news.project.identifier
                 message_id news
                 recipients news.recipients
                 subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
                 body :news => news,
                      :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
                 render_multipart('news_added', body)
               end
               # Builds a tmail object used to email recipients of a news' project when a news comment is added.
               #
               # Example:
               #   news_comment_added(comment) => tmail object
               #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
               def news_comment_added(comment)
                 news = comment.commented
                 redmine_headers 'Project' => news.project.identifier
                 message_id comment
                 recipients news.recipients
                 cc news.watcher_recipients
                 subject "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
                 body :news => news,
                      :comment => comment,
                      :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
                 render_multipart('news_comment_added', body)
               end
               # Builds a tmail object used to email the recipients of the specified message that was posted.
               #
               # Example:
               #   message_posted(message) => tmail object
               #   Mailer.deliver_message_posted(message) => sends an email to the recipients
               def message_posted(message)
                 redmine_headers 'Project' => message.project.identifier,
                                 'Topic-Id' => (message.parent_id || message.id)
                 message_id message
                 references message.parent unless message.parent.nil?
                 recipients(message.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}"
                 body :message => message,
                      :message_url => url_for(message.event_url)
                 render_multipart('message_posted', body)
               end
               # Builds a tmail object used to email the recipients of a project of the specified wiki content was added.
               #
               # Example:
               #   wiki_content_added(wiki_content) => tmail object
               #   Mailer.deliver_wiki_content_added(wiki_content) => sends an email to the project's recipients
               def wiki_content_added(wiki_content)
                 redmine_headers 'Project' => wiki_content.project.identifier,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 message_id wiki_content
                 recipients wiki_content.recipients
                 cc(wiki_content.page.wiki.watcher_recipients - recipients)
                 subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
                 body :wiki_content => wiki_content,
                      :wiki_content_url => url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
                                                   :id => wiki_content.page.title)
                 render_multipart('wiki_content_added', body)
               end
               # Builds a tmail object used to email the recipients of a project of the specified wiki content was updated.
               #
               # Example:
               #   wiki_content_updated(wiki_content) => tmail object
               #   Mailer.deliver_wiki_content_updated(wiki_content) => sends an email to the project's recipients
               def wiki_content_updated(wiki_content)
                 redmine_headers 'Project' => wiki_content.project.identifier,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 message_id wiki_content
                 recipients wiki_content.recipients
                 cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
                 subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
                 body :wiki_content => wiki_content,
                      :wiki_content_url => url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
                                                   :id => wiki_content.page.title),
                      :wiki_diff_url => url_for(:controller => 'wiki', :action => 'diff',
                                                :project_id => wiki_content.project, :id => wiki_content.page.title,
                                                :version => wiki_content.version)
                 render_multipart('wiki_content_updated', body)
               end
               # Builds a tmail object used to email the specified user their account information.
               #
               # Example:
               #   account_information(user, password) => tmail object
               #   Mailer.deliver_account_information(user, password) => sends account information to the user
               def account_information(user, password)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :user => user,
                      :password => password,
                      :login_url => url_for(:controller => 'account', :action => 'login')
                 render_multipart('account_information', body)
               end
               # Builds a tmail object used to email all active administrators of an account activation request.
               #
               # Example:
               #   account_activation_request(user) => tmail object
               #   Mailer.deliver_account_activation_request(user)=> sends an email to all active administrators
               def account_activation_request(user)
                 # Send the email to all active administrators
                 recipients User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
                 subject l(:mail_subject_account_activation_request, Setting.app_title)
                 body :user => user,
                      :url => url_for(:controller => 'users', :action => 'index',
                                      :status => User::STATUS_REGISTERED,
                                      :sort_key => 'created_on', :sort_order => 'desc')
                 render_multipart('account_activation_request', body)
               end
               # Builds a tmail object used to email the specified user that their account was activated by an administrator.
               #
               # Example:
               #   account_activated(user) => tmail object
               #   Mailer.deliver_account_activated(user) => sends an email to the registered user
               def account_activated(user)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :user => user,
                      :login_url => url_for(:controller => 'account', :action => 'login')
                 render_multipart('account_activated', body)
               end
               def lost_password(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_lost_password, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
                 render_multipart('lost_password', body)
               end
               def register(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
                 render_multipart('register', body)
               end
-              def test(user)
+              def test_email(user)
                 set_language_if_valid(user.language)
                 recipients user.mail
                 subject 'Redmine test'
                 body :url => url_for(:controller => 'welcome')
-                render_multipart('test', body)
+                render_multipart('test_email', body)
               end
               # Overrides default deliver! method to prevent from sending an email
               # with no recipient, cc or bcc
               def deliver!(mail = @mail)
                 set_language_if_valid @initial_language
                 return false if (recipients.nil? || recipients.empty?) &&
                                 (cc.nil? || cc.empty?) &&
                                 (bcc.nil? || bcc.empty?)
                 # Set Message-Id and References
                 if @message_id_object
                   mail.message_id = self.class.message_id_for(@message_id_object)
                 end
                 if @references_objects
                   mail.references = @references_objects.collect {|o| self.class.message_id_for(o)}
                 end
                 # Log errors when raise_delivery_errors is set to false, Rails does not
                 raise_errors = self.class.raise_delivery_errors
                 self.class.raise_delivery_errors = true
                 begin
                   return super(mail)
                 rescue Exception => e
                   if raise_errors
                     raise e
                   elsif mylogger
                     mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/configuration.yml."
                   end
                 ensure
                   self.class.raise_delivery_errors = raise_errors
                 end
               end
               # Sends reminders to issue assignees
               # Available options:
               # * :days     => how many days in the future to remind about (defaults to 7)
               # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
               # * :project  => id or identifier of project to process (defaults to all projects)
               # * :users    => array of user ids who should be reminded
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
                 user_ids = options[:users]
                 scope = Issue.open.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" +
                   " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
                   " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date]
                 )
                 scope = scope.scoped(:conditions => {:assigned_to_id => user_ids}) if user_ids.present?
                 scope = scope.scoped(:conditions => {:project_id => project.id}) if project
                 scope = scope.scoped(:conditions => {:tracker_id => tracker.id}) if tracker
                 issues_by_assignee = scope.all(:include => [:status, :assigned_to, :project, :tracker]).group_by(&:assigned_to)
                 issues_by_assignee.each do |assignee, issues|
                   deliver_reminder(assignee, issues, days) if assignee && assignee.active?
                 end
               end
               # Activates/desactivates email deliveries during +block+
               def self.with_deliveries(enabled = true, &block)
                 was_enabled = ActionMailer::Base.perform_deliveries
                 ActionMailer::Base.perform_deliveries = !!enabled
                 yield
               ensure
                 ActionMailer::Base.perform_deliveries = was_enabled
               end
               private
               def initialize_defaults(method_name)
                 super
                 @initial_language = current_language
                 set_language_if_valid Setting.default_language
                 from Setting.mail_from
                 # Common headers
                 headers 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,
                         'X-Redmine-Site' => Setting.app_title,
                         'X-Auto-Response-Suppress' => 'OOF',
                         'Auto-Submitted' => 'auto-generated'
               end
               # Appends a Redmine header field (name is prepended with 'X-Redmine-')
               def redmine_headers(h)
                 h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
               end
               # Overrides the create_mail method
               def create_mail
                 # Removes the current user from the recipients and cc
                 # if he doesn't want to receive notifications about what he does
                 @author ||= User.current
                 if @author.pref[:no_self_notified]
                   recipients.delete(@author.mail) if recipients
                   cc.delete(@author.mail) if cc
                 end
                 if @author.logged?
                   redmine_headers 'Sender' => @author.login
                 end
                 notified_users = [recipients, cc].flatten.compact.uniq
                 # Rails would log recipients only, not cc and bcc
                 mylogger.info "Sending email notification to: #{notified_users.join(', ')}" if mylogger
                 # Blind carbon copy recipients
                 if Setting.bcc_recipients?
                   bcc(notified_users)
                   recipients []
                   cc []
                 end
                 super
               end
               # Rails 2.3 has problems rendering implicit multipart messages with
               # layouts so this method will wrap an multipart messages with
               # explicit parts.
               #
               # https://rails.lighthouseapp.com/projects/8994/tickets/2338-actionmailer-mailer-views-and-content-type
               # https://rails.lighthouseapp.com/projects/8994/tickets/1799-actionmailer-doesnt-set-template_format-when-rendering-layouts
               def render_multipart(method_name, body)
                 if Setting.plain_text_mail?
                   content_type "text/plain"
                   body render(:file => "#{method_name}.text.erb",
                               :body => body,
                               :layout => 'mailer.text.erb')
                 else
                   content_type "multipart/alternative"
                   part :content_type => "text/plain",
                        :body => render(:file => "#{method_name}.text.erb",
                                        :body => body, :layout => 'mailer.text.erb')
                   part :content_type => "text/html",
                        :body => render_message("#{method_name}.html.erb", body)
                 end
               end
               # Makes partial rendering work with Rails 1.2 (retro-compatibility)
               def self.controller_path
                 ''
               end unless respond_to?('controller_path')
               # Returns a predictable Message-Id for the given object
               def self.message_id_for(object)
                 # id + timestamp should reduce the odds of a collision
                 # as far as we don't send multiple emails for the same object
                 timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
                 hash = "redmine.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}"
                 host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
                 host = "#{::Socket.gethostname}.redmine" if host.empty?
                 "<#{hash}@#{host}>"
               end
               private
               def message_id(object)
                 @message_id_object = object
               end
               def references(object)
                 @references_objects ||= []
                 @references_objects << object
               end
               def mylogger
                 Rails.logger
               end
             end
             # Patch TMail so that message_id is not overwritten
             module TMail
               class Mail
                 def add_message_id( fqdn = nil )
                   self.message_id ||= ::TMail::new_message_id(fqdn)
                 end
               end
             end

app/views/mailer/test_email.html.erb ~~app/views/mailer/test.html.erb~~ renamed 0 0

NO CONTENT: file renamed from app/views/mailer/test.html.erb to app/views/mailer/test_email.html.erb

app/views/mailer/test_email.text.erb ~~app/views/mailer/test.text.erb~~ renamed 0 0

NO CONTENT: file renamed from app/views/mailer/test.text.erb to app/views/mailer/test_email.text.erb

lib/tasks/email.rake +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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.
             namespace :redmine do
               namespace :email do
                 desc <<-END_DESC
             Read an email from standard input.
             General options:
               unknown_user=ACTION      how to handle emails from an unknown user
                                        ACTION can be one of the following values:
                                        ignore: email is ignored (default)
                                        accept: accept as anonymous user
                                        create: create a user account
               no_permission_check=1    disable permission checking when receiving
                                        the email
             Issue attributes control options:
               project=PROJECT          identifier of the target project
               status=STATUS            name of the target status
               tracker=TRACKER          name of the target tracker
               category=CATEGORY        name of the target category
               priority=PRIORITY        name of the target priority
               allow_override=ATTRS     allow email content to override attributes
                                        specified by previous options
                                        ATTRS is a comma separated list of attributes
             Examples:
               # No project specified. Emails MUST contain the 'Project' keyword:
               rake redmine:email:read RAILS_ENV="production" < raw_email
               # Fixed project and default tracker specified, but emails can override
               # both tracker and priority attributes:
               rake redmine:email:read RAILS_ENV="production" \\
                               project=foo \\
                               tracker=bug \\
                               allow_override=tracker,priority < raw_email
             END_DESC
                 task :read => :environment do
                   options = { :issue => {} }
                   %w(project status tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
                   options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
                   options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
                   options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
                   MailHandler.receive(STDIN.read, options)
                 end
                 desc <<-END_DESC
             Read emails from an IMAP server.
             General options:
               unknown_user=ACTION      how to handle emails from an unknown user
                                        ACTION can be one of the following values:
                                        ignore: email is ignored (default)
                                        accept: accept as anonymous user
                                        create: create a user account
               no_permission_check=1    disable permission checking when receiving
                                        the email
             Available IMAP options:
               host=HOST                IMAP server host (default: 127.0.0.1)
               port=PORT                IMAP server port (default: 143)
               ssl=SSL                  Use SSL? (default: false)
               username=USERNAME        IMAP account
               password=PASSWORD        IMAP password
               folder=FOLDER            IMAP folder to read (default: INBOX)
             Issue attributes control options:
               project=PROJECT          identifier of the target project
               status=STATUS            name of the target status
               tracker=TRACKER          name of the target tracker
               category=CATEGORY        name of the target category
               priority=PRIORITY        name of the target priority
               allow_override=ATTRS     allow email content to override attributes
                                        specified by previous options
                                        ATTRS is a comma separated list of attributes
             Processed emails control options:
               move_on_success=MAILBOX  move emails that were successfully received
                                        to MAILBOX instead of deleting them
               move_on_failure=MAILBOX  move emails that were ignored to MAILBOX
             Examples:
               # No project specified. Emails MUST contain the 'Project' keyword:
               rake redmine:email:receive_imap RAILS_ENV="production" \\
                 host=imap.foo.bar username=redmine@example.net password=xxx
               # Fixed project and default tracker specified, but emails can override
               # both tracker and priority attributes:
               rake redmine:email:receive_imap RAILS_ENV="production" \\
                 host=imap.foo.bar username=redmine@example.net password=xxx ssl=1 \\
                 project=foo \\
                 tracker=bug \\
                 allow_override=tracker,priority
             END_DESC
                 task :receive_imap => :environment do
                   imap_options = {:host => ENV['host'],
                                   :port => ENV['port'],
                                   :ssl => ENV['ssl'],
                                   :username => ENV['username'],
                                   :password => ENV['password'],
                                   :folder => ENV['folder'],
                                   :move_on_success => ENV['move_on_success'],
                                   :move_on_failure => ENV['move_on_failure']}
                   options = { :issue => {} }
                   %w(project status tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
                   options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
                   options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
                   options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
                   Redmine::IMAP.check(imap_options, options)
                 end
                 desc <<-END_DESC
             Read emails from an POP3 server.
             Available POP3 options:
               host=HOST                POP3 server host (default: 127.0.0.1)
               port=PORT                POP3 server port (default: 110)
               username=USERNAME        POP3 account
               password=PASSWORD        POP3 password
               apop=1                   use APOP authentication (default: false)
               delete_unprocessed=1     delete messages that could not be processed
                                        successfully from the server (default
                                        behaviour is to leave them on the server)
             See redmine:email:receive_imap for more options and examples.
             END_DESC
                 task :receive_pop3 => :environment do
                   pop_options  = {:host => ENV['host'],
                                   :port => ENV['port'],
                                   :apop => ENV['apop'],
                                   :username => ENV['username'],
                                   :password => ENV['password'],
                                   :delete_unprocessed => ENV['delete_unprocessed']}
                   options = { :issue => {} }
                   %w(project status tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
                   options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
                   options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
                   options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
                   Redmine::POP3.check(pop_options, options)
                 end
                 desc "Send a test email to the user with the provided login name"
                 task :test, [:login] => :environment do |task, args|
                   include Redmine::I18n
                   abort l(:notice_email_error, "Please include the user login to test with. Example: rake redmine:email:test[login]") if args[:login].blank?
                   user = User.find_by_login(args[:login])
                   abort l(:notice_email_error, "User #{args[:login]} not found") unless user && user.logged?
                   ActionMailer::Base.raise_delivery_errors = true
                   begin
-                    Mailer.deliver_test(User.current)
+                    Mailer.deliver_test_email(User.current)
                     puts l(:notice_email_sent, user.mail)
                   rescue Exception => e
                     abort l(:notice_email_error, e.message)
                   end
                 end
               end
             end

test/functional/admin_controller_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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__)
             require 'admin_controller'
             # Re-raise errors caught by the controller.
             class AdminController; def rescue_action(e) raise e end; end
             class AdminControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles
               def setup
                 @controller = AdminController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_no_tag :tag => 'div',
                               :attributes => { :class => /nodata/ }
               end
               def test_index_with_no_configuration_data
                 delete_configuration_data
                 get :index
                 assert_tag :tag => 'div',
                            :attributes => { :class => /nodata/ }
               end
               def test_projects
                 get :projects
                 assert_response :success
                 assert_template 'projects'
                 assert_not_nil assigns(:projects)
                 # active projects only
                 assert_nil assigns(:projects).detect {|u| !u.active?}
               end
               def test_projects_with_status_filter
                 get :projects, :status => 1
                 assert_response :success
                 assert_template 'projects'
                 assert_not_nil assigns(:projects)
                 # active projects only
                 assert_nil assigns(:projects).detect {|u| !u.active?}
               end
               def test_projects_with_name_filter
                 get :projects, :name => 'store', :status => ''
                 assert_response :success
                 assert_template 'projects'
                 projects = assigns(:projects)
                 assert_not_nil projects
                 assert_equal 1, projects.size
                 assert_equal 'OnlineStore', projects.first.name
               end
               def test_load_default_configuration_data
                 delete_configuration_data
                 post :default_configuration, :lang => 'fr'
                 assert_response :redirect
                 assert_nil flash[:error]
                 assert IssueStatus.find_by_name('Nouveau')
               end
               def test_test_email
                 get :test_email
                 assert_redirected_to '/settings/edit?tab=notifications'
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 user = User.find(1)
                 assert_equal [user.mail], mail.bcc
               end
               def test_test_email_failure_should_display_the_error
-                Mailer.stubs(:deliver_test).raises(Exception, 'Some error message')
+                Mailer.stubs(:deliver_test_email).raises(Exception, 'Some error message')
                 get :test_email
                 assert_redirected_to '/settings/edit?tab=notifications'
                 assert_match /Some error message/, flash[:error]
               end
               def test_no_plugins
                 Redmine::Plugin.clear
                 get :plugins
                 assert_response :success
                 assert_template 'plugins'
               end
               def test_plugins
                 # Register a few plugins
                 Redmine::Plugin.register :foo do
                   name 'Foo plugin'
                   author 'John Smith'
                   description 'This is a test plugin'
                   version '0.0.1'
                   settings :default => {'sample_setting' => 'value', 'foo'=>'bar'}, :partial => 'foo/settings'
                 end
                 Redmine::Plugin.register :bar do
                 end
                 get :plugins
                 assert_response :success
                 assert_template 'plugins'
                 assert_tag :td, :child => { :tag => 'span', :content => 'Foo plugin' }
                 assert_tag :td, :child => { :tag => 'span', :content => 'Bar' }
               end
               def test_info
                 get :info
                 assert_response :success
                 assert_template 'info'
               end
               def test_admin_menu_plugin_extension
                 Redmine::MenuManager.map :admin_menu do |menu|
                   menu.push :test_admin_menu_plugin_extension, '/foo/bar', :caption => 'Test'
                 end
                 get :index
                 assert_response :success
                 assert_tag :a, :attributes => { :href => '/foo/bar' },
                                :content => 'Test'
                 Redmine::MenuManager.map :admin_menu do |menu|
                   menu.delete :test_admin_menu_plugin_extension
                 end
               end
               private
               def delete_configuration_data
                 Role.delete_all('builtin = 0')
                 Tracker.delete_all
                 IssueStatus.delete_all
                 Enumeration.delete_all
               end
             end

test/unit/mailer_test.rb +5 -5

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 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,
                        :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\'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'
                 Redmine::Utils.relative_url_root = '/rdm'
                 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\'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_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\'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_string('X-Auto-Response-Suppress')
                 assert_equal 'auto-generated', mail.header_string('Auto-Submitted')
               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_string('X-Redmine-Sender')
               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", 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.deliver_test(User.find(1))
+                  Mailer.deliver_test_email(User.find(1))
                 end
                 mail = last_email
                 assert_equal 'redmine@example.net', mail.from_addrs.first.address
               end
               def test_from_header_with_phrase
                 with_settings :mail_from => 'Redmine app <redmine@example.net>' do
-                  Mailer.deliver_test(User.find(1))
+                  Mailer.deliver_test_email(User.find(1))
                 end
                 mail = last_email
                 assert_equal 'redmine@example.net', mail.from_addrs.first.address
                 assert_equal 'Redmine app', mail.from_addrs.first.name
               end
               def test_should_not_send_email_without_recipient
                 news = News.find(: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.deliver_news_added(news.reload)
                 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.deliver_news_added(news.reload)
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_issue_add_message_id
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
                 mail = last_email
                 assert_equal Mailer.message_id_for(issue), mail.message_id
                 assert_nil mail.references
               end
               def test_issue_edit_message_id
                 journal = Journal.find(1)
                 Mailer.deliver_issue_edit(journal)
                 mail = last_email
                 assert_equal Mailer.message_id_for(journal), mail.message_id
                 assert_equal Mailer.message_id_for(journal.issue), mail.references.first.to_s
                 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.deliver_message_posted(message)
                 mail = last_email
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 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
               def test_reply_posted_message_id
                 message = Message.find(3)
                 Mailer.deliver_message_posted(message)
                 mail = last_email
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 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
               context("#issue_add") do
                 setup do
                   ActionMailer::Base.deliveries.clear
                   Setting.bcc_recipients = '1'
                   @issue = Issue.find(1)
                 end
                 should "notify project members" do
                   assert Mailer.deliver_issue_add(@issue)
                   assert last_email.bcc.include?('dlopper@somenet.foo')
                 end
                 should "not notify project members that are not allow to view the issue" do
                   Role.find(2).remove_permission!(:view_issues)
                   assert Mailer.deliver_issue_add(@issue)
                   assert !last_email.bcc.include?('dlopper@somenet.foo')
                 end
                 should "notify issue watchers" do
                   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
                 should "not notify watchers not allowed to view the issue" do
                   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
               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_document_added
                 document = Document.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_document_added(document)
                 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.deliver_attachments_added(attachements)
                 end
               end
               def test_version_file_added
                 attachements = [ Attachment.find_by_container_type('Version') ]
                 assert Mailer.deliver_attachments_added(attachements)
                 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.deliver_attachments_added(attachements)
                 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.find(:first)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_news_added(news)
                 end
               end
               def test_news_comment_added
                 comment = Comment.find(2)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_news_comment_added(comment)
                 end
               end
               def test_message_posted
                 message = Message.find(: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.deliver_message_posted(message)
                 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.deliver_wiki_content_added(content)
                   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.deliver_wiki_content_updated(content)
                   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.deliver_account_information(user, 'pAsswORd')
                 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.deliver_lost_password(token)
                 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.deliver_register(token)
                   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.deliver_test(user)
+                  assert Mailer.deliver_test_email(user)
                 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.include?('Bug #3: Error 281 when updating a recipe')
                 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.include?('Closed issue')
                 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.include?('Bug #3: Error 281 when updating a recipe')
               end
               def last_email
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 mail
               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.deliver_account_activated(user)
                 mail = last_email
                 assert mail.body.include?('Votre compte')
                 assert_equal :it, current_language
               end
               def test_with_deliveries_off
                 Mailer.with_deliveries false do
-                  Mailer.deliver_test(User.find(1))
+                  Mailer.deliver_test_email(User.find(1))
                 end
                 assert ActionMailer::Base.deliveries.empty?
                 # should restore perform_deliveries
                 assert ActionMailer::Base.perform_deliveries
               end
               def test_tmail_to_header_field_should_not_include_blank_lines
                 mail = TMail::Mail.new
                 mail.to = ["a.user@example.com", "v.user2@example.com", "e.smith@example.com", "info@example.com", "v.pupkin@example.com",
                   "b.user@example.com", "w.user2@example.com", "f.smith@example.com", "info2@example.com", "w.pupkin@example.com"]
                 assert !mail.encoded.strip.split("\r\n").detect(&:blank?), "#{mail.encoded} malformed"
               end
               def test_layout_should_include_the_emails_header
                 with_settings :emails_header => "*Header content*" do
-                  assert Mailer.deliver_test(User.find(1))
+                  assert Mailer.deliver_test_email(User.find(1))
                   assert_select_email do
                     assert_select ".header" do
                       assert_select "strong", :text => "Header content"
                     end
                   end
                 end
               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