From 197ec295e036f3aaf574df3a804a29a88c48161d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 26 Mar 2016 10:08:37 +0000 Subject: Clear settings that are changed by these tests. git-svn-id: http://svn.redmine.org/redmine/trunk@15286 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/settings_controller_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'test/functional') diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index 4d67bf0f7..ff45150ad 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -26,6 +26,11 @@ class SettingsControllerTest < ActionController::TestCase @request.session[:user_id] = 1 # admin end + def teardown + Setting.delete_all + Setting.clear_cache + end + def test_index get :index assert_response :success @@ -78,7 +83,6 @@ class SettingsControllerTest < ActionController::TestCase assert !Setting.bcc_recipients? assert_equal %w(issue_added issue_updated news_added), Setting.notified_events assert_equal 'Test footer', Setting.emails_footer - Setting.clear_cache end def test_edit_commit_update_keywords -- cgit v1.2.3