Merged r14389 (#20203).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14402 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-07-05 10:30:21 +00:00
parent a8993e0347
commit dc724dfc51
4 changed files with 5 additions and 5 deletions

View File

@@ -87,7 +87,7 @@ class AdminControllerTest < ActionController::TestCase
user.pref.save!
ActionMailer::Base.deliveries.clear
get :test_email
post :test_email
assert_redirected_to '/settings?tab=notifications'
mail = ActionMailer::Base.deliveries.last
assert_not_nil mail
@@ -97,7 +97,7 @@ class AdminControllerTest < ActionController::TestCase
def test_test_email_failure_should_display_the_error
Mailer.stubs(:test_email).raises(Exception, 'Some error message')
get :test_email
post :test_email
assert_redirected_to '/settings?tab=notifications'
assert_match /Some error message/, flash[:error]
end