Renamed Mailer#test to Mailer#test_email.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9080 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 6 insertions, 6 deletions

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 90e658905..2e136bfdc 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -91,7 +91,7 @@ class AdminControllerTest < ActionController::TestCase
   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]
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 8ac1c5a80..6d652cb23 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -196,7 +196,7 @@ class MailerTest < ActiveSupport::TestCase
 
   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
@@ -204,7 +204,7 @@ class MailerTest < ActiveSupport::TestCase
 
   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
@@ -461,7 +461,7 @@ class MailerTest < ActiveSupport::TestCase
     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
 
@@ -522,7 +522,7 @@ class MailerTest < ActiveSupport::TestCase
 
   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
@@ -539,7 +539,7 @@ class MailerTest < ActiveSupport::TestCase
 
   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"