summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-03-26 10:08:37 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-03-26 10:08:37 +0000
commit197ec295e036f3aaf574df3a804a29a88c48161d (patch)
treef883de79d8e0b0de92b29ea26a880630261a9fe7 /test/functional
parent56ba4d02097a6eab3135281330c7574688fb0e56 (diff)
downloadredmine-197ec295e036f3aaf574df3a804a29a88c48161d.tar.gz
redmine-197ec295e036f3aaf574df3a804a29a88c48161d.zip
Clear settings that are changed by these tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@15286 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/settings_controller_test.rb6
1 files changed, 5 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