13996: Update tests for cleaner config access

[arvados.git] / services / api / test / integration / user_sessions_test.rb

diff --git a/services/api/test/integration/user_sessions_test.rb b/services/api/test/integration/user_sessions_test.rb
index f5085999ec5681d9da56f5244bd204e5473246dd..fdb8628c5d1377abfc9a2273c27d3b254265240d 100644 (file)
--- a/services/api/test/integration/user_sessions_test.rb
+++ b/services/api/test/integration/user_sessions_test.rb
@@ -28,8 +28,8 @@ class UserSessionsApiTest < ActionDispatch::IntegrationTest
     mock['info']['username'] = username unless username.nil?
     mock['info']['identity_url'] = identity_url unless identity_url.nil?
     post('/auth/josh_id/callback',
-         {return_to: client_url(remote: remote)},
-         {'omniauth.auth' => mock})
+      params: {return_to: client_url(remote: remote)},
+      headers: {'omniauth.auth' => mock})
 
     errors = {
       :redirect => 'Did not redirect to client with token',
@@ -111,10 +111,10 @@ class UserSessionsApiTest < ActionDispatch::IntegrationTest
    ].each do |testcase|
     test "user auto-activate #{testcase.inspect}" do
       # Configure auto_setup behavior according to testcase[:cfg]
-      Rails.configuration.auto_setup_new_users = testcase[:cfg][:auto]
-      Rails.configuration.auto_setup_new_users_with_vm_uuid =
-        (testcase[:cfg][:vm] ? virtual_machines(:testvm).uuid : false)
-      Rails.configuration.auto_setup_new_users_with_repository =
+      Rails.configuration.Users.AutoSetupNewUsers = testcase[:cfg][:auto]
+      Rails.configuration.Users.AutoSetupNewUsersWithVmUUID =
+        (testcase[:cfg][:vm] ? virtual_machines(:testvm).uuid : "")
+      Rails.configuration.Users.AutoSetupNewUsersWithRepository =
         testcase[:cfg][:repo]
 
       mock_auth_with(email: testcase[:email])