13996: Migrate tests to new config

[arvados.git] / services / api / test / test_helper.rb

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index 939242cf8e70eca87be21abac8ac1ef94c2a0a9b..e87a1c6d8a9daa353b01e683ef58e67eed9884c4 100644 (file)
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -99,11 +99,8 @@ class ActiveSupport::TestCase
 
   def restore_configuration
     # Restore configuration settings changed during tests
-    $application_config.each do |k,v|
-      if k.match(/^[^.]*$/)
-        Rails.configuration.send (k + '='), v
-      end
-    end
+    copy_into_config $arvados_config, Rails.configuration
+    copy_into_config $remaining_config, Rails.configuration
   end
 
   def set_user_from_auth(auth_name)