jro_apps/redmine Commit - r9455:7af8d7caf064

replace Mailer deliver syntax to Rails3 style...

Toshi MARUYAMA -

r9455:7af8d7caf064

parent child

Context file:

r9455:7af8d7caf064

Collapse all files

app/controllers/account_controller.rb +3 -3

                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
-                      Mailer.deliver_lost_password(token)
+                      Mailer.lost_password(token).deliver
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to :action => 'login'
                       return
               def register_by_email_activation(user, &block)
                 token = Token.new(:user => user, :action => "register")
                 if user.save and token.save
-                  Mailer.deliver_register(token)
+                  Mailer.register(token).deliver
                   flash[:notice] = l(:notice_account_register_done)
                   redirect_to :action => 'login'
                 else
               def register_manually_by_administrator(user, &block)
                 if user.save
                   # Sends an email to the administrators
-                  Mailer.deliver_account_activation_request(user)
+                  Mailer.account_activation_request(user).deliver
                   account_pending
                 else
                   yield if block_given?

app/controllers/admin_controller.rb +1 -1

                 # Force ActionMailer to raise delivery errors so we can catch it
                 ActionMailer::Base.raise_delivery_errors = true
                 begin
-                  @test = Mailer.deliver_test_email(User.current)
+                  @test = Mailer.test_email(User.current).deliver
                   flash[:notice] = l(:notice_email_sent, User.current.mail)
                 rescue Exception => e
                   flash[:error] = l(:notice_email_error, e.message)

app/controllers/documents_controller.rb +3 -1

                 attachments = Attachment.attach_files(@document, params[:attachments])
                 render_attachment_warning_if_needed(@document)
-                Mailer.deliver_attachments_added(attachments[:files]) if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
+                if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
+                  Mailer.attachments_added(attachments[:files]).deliver
+                end
                 redirect_to :action => 'show', :id => @document
               end
             end

app/controllers/files_controller.rb +1 -1

                 render_attachment_warning_if_needed(container)
                 if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-                  Mailer.deliver_attachments_added(attachments[:files])
+                  Mailer.attachments_added(attachments[:files]).deliver
                 end
                 redirect_to project_files_path(@project)
               end

app/controllers/users_controller.rb +3 -3

                   @user.pref.save
                   @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
-                  Mailer.deliver_account_information(@user, params[:user][:password]) if params[:send_information]
+                  Mailer.account_information(@user, params[:user][:password]).deliver if params[:send_information]
                   respond_to do |format|
                     format.html {
                   @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                   if was_activated
-                    Mailer.deliver_account_activated(@user)
+                    Mailer.account_activated(@user).deliver
                   elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil?
-                    Mailer.deliver_account_information(@user, params[:user][:password])
+                    Mailer.account_information(@user, params[:user][:password]).deliver
                   end
                   respond_to do |format|

app/models/comment_observer.rb +1 -1

             class CommentObserver < ActiveRecord::Observer
               def after_create(comment)
                 if comment.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')
-                  Mailer.deliver_news_comment_added(comment)
+                  Mailer.news_comment_added(comment).deliver
                 end
               end
             end

app/models/document_observer.rb +1 -1

             class DocumentObserver < ActiveRecord::Observer
               def after_create(document)
-                Mailer.deliver_document_added(document) if Setting.notified_events.include?('document_added')
+                Mailer.document_added(document).deliver if Setting.notified_events.include?('document_added')
               end
             end

app/models/issue_observer.rb +1 -1

             class IssueObserver < ActiveRecord::Observer
               def after_create(issue)
-                Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
+                Mailer.issue_add(issue).deliver if Setting.notified_events.include?('issue_added')
               end
             end

app/models/journal_observer.rb +1 -1

                       (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
                       (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
                     )
-                  Mailer.deliver_issue_edit(journal)
+                  Mailer.issue_edit(journal).deliver
                 end
               end
             end

app/models/mail_handler.rb +1 -1

                       if logger && logger.info
                         logger.info "MailHandler: [#{@user.login}] account created"
                       end
-                      Mailer.deliver_account_information(@user, @user.password)
+                      Mailer.account_information(@user, @user.password).deliver
                     else
                       if logger && logger.error
                         logger.error "MailHandler: could not create account for [#{sender_email}]"

app/models/message_observer.rb +1 -1

             class MessageObserver < ActiveRecord::Observer
               def after_create(message)
-                Mailer.deliver_message_posted(message) if Setting.notified_events.include?('message_posted')
+                Mailer.message_posted(message).deliver if Setting.notified_events.include?('message_posted')
               end
             end

app/models/news_observer.rb +1 -1

             class NewsObserver < ActiveRecord::Observer
               def after_create(news)
-                Mailer.deliver_news_added(news) if Setting.notified_events.include?('news_added')
+                Mailer.news_added(news).deliver if Setting.notified_events.include?('news_added')
               end
             end

app/models/wiki_content_observer.rb +2 -2

             class WikiContentObserver < ActiveRecord::Observer
               def after_create(wiki_content)
-                Mailer.deliver_wiki_content_added(wiki_content) if Setting.notified_events.include?('wiki_content_added')
+                Mailer.wiki_content_added(wiki_content).deliver if Setting.notified_events.include?('wiki_content_added')
               end
               def after_update(wiki_content)
                 if wiki_content.text_changed?
-                  Mailer.deliver_wiki_content_updated(wiki_content) if Setting.notified_events.include?('wiki_content_updated')
+                  Mailer.wiki_content_updated(wiki_content).deliver if Setting.notified_events.include?('wiki_content_updated')
                 end
               end
             end

lib/tasks/email.rake +1 -1

                   ActionMailer::Base.raise_delivery_errors = true
                   begin
                     Mailer.with_synched_deliveries do
-                      Mailer.deliver_test_email(user)
+                      Mailer.test_email(user).deliver
                     end
                     puts l(:notice_email_sent, user.mail)
                   rescue Exception => e

test/unit/lib/redmine/hook_test.rb +2 -2

                 issue = Issue.find(1)
                 ActionMailer::Base.deliveries.clear
-                Mailer.deliver_issue_add(issue)
+                Mailer.issue_add(issue).deliver
                 mail = ActionMailer::Base.deliveries.last
                 @hook_module.add_listener(TestLinkToHook)
                 hook_helper.call_hook(:view_layouts_base_html_head)
                 ActionMailer::Base.deliveries.clear
-                Mailer.deliver_issue_add(issue)
+                Mailer.issue_add(issue).deliver
                 mail2 = ActionMailer::Base.deliveries.last
                 assert_equal mail_body(mail), mail_body(mail2)

test/unit/mailer_test.rb +37 -37

                 Setting.protocol = 'https'
                 journal = Journal.find(3)
-                assert Mailer.deliver_issue_edit(journal)
+                assert Mailer.issue_edit(journal).deliver
                 mail = last_email
                 assert_not_nil mail
                 Setting.protocol = 'http'
                 journal = Journal.find(3)
-                assert Mailer.deliver_issue_edit(journal)
+                assert Mailer.issue_edit(journal).deliver
                 mail = last_email
                 assert_not_nil mail
                 Redmine::Utils.relative_url_root = nil
                 journal = Journal.find(3)
-                assert Mailer.deliver_issue_edit(journal)
+                assert Mailer.issue_edit(journal).deliver
                 mail = last_email
                 assert_not_nil mail
               def test_email_headers
                 issue = Issue.find(1)
-                Mailer.deliver_issue_add(issue)
+                Mailer.issue_add(issue).deliver
                 mail = last_email
                 assert_not_nil mail
                 assert_equal 'OOF', mail.header['X-Auto-Response-Suppress'].to_s
               def test_email_headers_should_include_sender
                 issue = Issue.find(1)
-                Mailer.deliver_issue_add(issue)
+                Mailer.issue_add(issue).deliver
                 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)
+                Mailer.issue_edit(journal).deliver
                 mail = last_email
                 assert_equal "text/plain; charset=UTF-8", mail.content_type
                 assert_equal 0, mail.parts.size
               def test_html_mail
                 Setting.plain_text_mail = 0
                 journal = Journal.find(2)
-                Mailer.deliver_issue_edit(journal)
+                Mailer.issue_edit(journal).deliver
                 mail = last_email
                 assert_equal 2, mail.parts.size
                 assert mail.encoded.include?('href')
               def test_from_header
                 with_settings :mail_from => 'redmine@example.net' do
-                  Mailer.deliver_test_email(User.find(1))
+                  Mailer.test_email(User.find(1)).deliver
                 end
                 mail = last_email
                 assert_equal 'redmine@example.net', mail.from_addrs.first
               def test_from_header_with_phrase
                 with_settings :mail_from => 'Redmine app <redmine@example.net>' do
-                  Mailer.deliver_test_email(User.find(1))
+                  Mailer.test_email(User.find(1)).deliver
                 end
                 mail = last_email
                 assert_equal 'redmine@example.net', mail.from_addrs.first
                 user.pref[:no_self_notified] = false
                 user.pref.save
                 User.current = user
-                Mailer.deliver_news_added(news.reload)
+                Mailer.news_added(news.reload).deliver
                 assert_equal 1, last_email.bcc.size
                 # nobody to notify
                 user.pref.save
                 User.current = user
                 ActionMailer::Base.deliveries.clear
-                Mailer.deliver_news_added(news.reload)
+                Mailer.news_added(news.reload).deliver
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_issue_add_message_id
                 issue = Issue.find(1)
-                Mailer.deliver_issue_add(issue)
+                Mailer.issue_add(issue).deliver
                 mail = last_email
                 assert_equal Mailer.message_id_for(issue), mail.message_id
                 assert_nil mail.references
               def test_issue_edit_message_id
                 journal = Journal.find(1)
-                Mailer.deliver_issue_edit(journal)
+                Mailer.issue_edit(journal).deliver
                 mail = last_email
                 assert_equal Mailer.message_id_for(journal), mail.message_id
                 assert_include Mailer.message_id_for(journal.issue), mail.references
               def test_message_posted_message_id
                 message = Message.find(1)
-                Mailer.deliver_message_posted(message)
+                Mailer.message_posted(message).deliver
                 mail = last_email
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_nil mail.references
               def test_reply_posted_message_id
                 message = Message.find(3)
-                Mailer.deliver_message_posted(message)
+                Mailer.message_posted(message).deliver
                 mail = last_email
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_include Mailer.message_id_for(message.parent), mail.references
                 end
                 should "notify project members" do
-                  assert Mailer.deliver_issue_add(@issue)
+                  assert Mailer.issue_add(@issue).deliver
                   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 Mailer.issue_add(@issue).deliver
                   assert !last_email.bcc.include?('dlopper@somenet.foo')
                 end
                   user.save
                   Watcher.create!(:watchable => @issue, :user => user)
-                  assert Mailer.deliver_issue_add(@issue)
+                  assert Mailer.issue_add(@issue).deliver
                   assert last_email.bcc.include?(user.mail)
                 end
                   user = User.find(9)
                   Watcher.create!(:watchable => @issue, :user => user)
                   Role.non_member.remove_permission!(:view_issues)
-                  assert Mailer.deliver_issue_add(@issue)
+                  assert Mailer.issue_add(@issue).deliver
                   assert !last_email.bcc.include?(user.mail)
                 end
               end
                 issue = Issue.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_issue_add(issue)
+                  assert Mailer.issue_add(issue).deliver
                 end
               end
                 journal = Journal.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_issue_edit(journal)
+                  assert Mailer.issue_edit(journal).deliver
                 end
               end
                 document = Document.find(1)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_document_added(document)
+                  assert Mailer.document_added(document).deliver
                 end
               end
                 attachements = [ Attachment.find_by_container_type('Document') ]
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_attachments_added(attachements)
+                  assert Mailer.attachments_added(attachements).deliver
                 end
               end
               def test_version_file_added
                 attachements = [ Attachment.find_by_container_type('Version') ]
-                assert Mailer.deliver_attachments_added(attachements)
+                assert Mailer.attachments_added(attachements).deliver
                 assert_not_nil last_email.bcc
                 assert last_email.bcc.any?
                 assert_select_email do
               def test_project_file_added
                 attachements = [ Attachment.find_by_container_type('Project') ]
-                assert Mailer.deliver_attachments_added(attachements)
+                assert Mailer.attachments_added(attachements).deliver
                 assert_not_nil last_email.bcc
                 assert last_email.bcc.any?
                 assert_select_email do
                 news = News.find(:first)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_news_added(news)
+                  assert Mailer.news_added(news).deliver
                 end
               end
                 comment = Comment.find(2)
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_news_comment_added(comment)
+                  assert Mailer.news_comment_added(comment).deliver
                 end
               end
                 recipients = recipients.compact.uniq
                 valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
-                  assert Mailer.deliver_message_posted(message)
+                  assert Mailer.message_posted(message).deliver
                 end
               end
                 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)
+                    assert Mailer.wiki_content_added(content).deliver
                   end
                 end
               end
                 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)
+                    assert Mailer.wiki_content_updated(content).deliver
                   end
                 end
               end
                 valid_languages.each do |lang|
                   user.update_attribute :language, lang.to_s
                   user.reload
-                  assert Mailer.deliver_account_information(user, 'pAsswORd')
+                  assert Mailer.account_information(user, 'pAsswORd').deliver
                 end
               end
                 valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
                   token.reload
-                  assert Mailer.deliver_lost_password(token)
+                  assert Mailer.lost_password(token).deliver
                 end
               end
                   token.user.update_attribute :language, lang.to_s
                   token.reload
                   ActionMailer::Base.deliveries.clear
-                  assert Mailer.deliver_register(token)
+                  assert Mailer.register(token).deliver
                   mail = last_email
                   assert_select_email do
                     assert_select "a[href=?]",
                 user = User.find(1)
                 valid_languages.each do |lang|
                   user.update_attribute :language, lang.to_s
-                  assert Mailer.deliver_test_email(user)
+                  assert Mailer.test_email(user).deliver
                 end
               end
                 # Send an email to a french user
                 user = User.find(1)
                 user.language = 'fr'
-                Mailer.deliver_account_activated(user)
+                Mailer.account_activated(user).deliver
                 mail = last_email
                 assert_mail_body_match 'Votre compte', mail
               def test_with_deliveries_off
                 Mailer.with_deliveries false do
-                  Mailer.deliver_test_email(User.find(1))
+                  Mailer.test_email(User.find(1)).deliver
                 end
                 assert ActionMailer::Base.deliveries.empty?
                 # should restore perform_deliveries
               def test_layout_should_include_the_emails_header
                 with_settings :emails_header => "*Header content*" do
-                  assert Mailer.deliver_test_email(User.find(1))
+                  assert Mailer.test_email(User.find(1)).deliver
                   assert_select_email do
                     assert_select ".header" do
                       assert_select "strong", :text => "Header content"

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