From 3e2927123ab9c6c8ab48b50ed65490f809e9e18a Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 6 Oct 2014 12:00:50 -0400 Subject: [PATCH] 3782: Restore config settings changed during tests. (copied from API server) --- apps/workbench/test/test_helper.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb index 1195798312..5253676578 100644 --- a/apps/workbench/test/test_helper.rb +++ b/apps/workbench/test/test_helper.rb @@ -36,10 +36,15 @@ class ActiveSupport::TestCase Thread.current[:arvados_api_token] = auth['api_token'] end - def teardown + teardown do Thread.current[:arvados_api_token] = nil Thread.current[:reader_tokens] = nil - super + # Restore configuration settings changed during tests + $application_config.each do |k,v| + if k.match /^[^.]*$/ + Rails.configuration.send (k + '='), v + end + end end end -- 2.30.2