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

                  # 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)

app/models/mailer.rb +2 -2

                  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

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

                    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)

test/functional/admin_controller_test.rb +1 -1

                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]

test/unit/mailer_test.rb +5 -5

                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
                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
                  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_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
                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"

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