diff options
| -rw-r--r-- | test/functional/settings_controller_test.rb | 6 | ||||
| -rw-r--r-- | test/unit/setting_test.rb | 1 |
2 files changed, 6 insertions, 1 deletions
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 diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb index 45a4b922f..58ea2fba2 100644 --- a/test/unit/setting_test.rb +++ b/test/unit/setting_test.rb @@ -22,6 +22,7 @@ require File.expand_path('../../test_helper', __FILE__) class SettingTest < ActiveSupport::TestCase def teardown + Setting.delete_all Setting.clear_cache end |