From f08b648ccee66d141b90fd35bf688c98cd7f14da Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 5 May 2012 14:34:16 +0000 Subject: [PATCH] fix error of AdminControllerTest test_test_email_failure_should_display_the_error git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9641 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/admin_controller_test.rb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb index 981376105..f837b5063 100644 --- a/test/functional/admin_controller_test.rb +++ b/test/functional/admin_controller_test.rb @@ -20,9 +20,23 @@ require File.expand_path('../../test_helper', __FILE__) class AdminControllerTest < ActionController::TestCase fixtures :projects, :users, :roles + class TestDelivery + def initialize(*) + end + + def deliver!(mail) + raise 'Some error message' + end + end + def setup User.current = nil @request.session[:user_id] = 1 # admin + @old_delivery_method = ActionMailer::Base.delivery_method + end + + def teardown + ActionMailer::Base.delivery_method = @old_delivery_method end def test_index @@ -98,7 +112,7 @@ class AdminControllerTest < ActionController::TestCase end def test_test_email_failure_should_display_the_error - Mailer.stubs(:deliver_test_email).raises(Exception, 'Some error message') + ActionMailer::Base.delivery_method = TestDelivery get :test_email assert_redirected_to '/settings/edit?tab=notifications' assert_match /Some error message/, flash[:error] -- 2.39.5