X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6fe8e52020d421797306e5c6536afbcee761510a..de11b137d4469e9d54e078ac0dd5664bdb90e486:/apps/workbench/test/integration/link_account_test.rb

diff --git a/apps/workbench/test/integration/link_account_test.rb b/apps/workbench/test/integration/link_account_test.rb
index 9c22f5a772..53c7ec8553 100644
--- a/apps/workbench/test/integration/link_account_test.rb
+++ b/apps/workbench/test/integration/link_account_test.rb
@@ -10,6 +10,10 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
     need_javascript
   end
 
+  teardown do
+    Rails.configuration.testing_override_login_url = false
+  end
+
   def start_sso_stub token
     port = available_port('sso_stub')
 
@@ -38,8 +42,7 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
 
   test "Add another login to this account" do
     visit page_with_token('active_trustedclient')
-    stub = start_sso_stub(api_fixture('api_client_authorizations')['project_viewer_trustedclient']['api_token'])
-    Rails.configuration.arvados_login_base = stub + "login"
+    Rails.configuration.testing_override_login_url = start_sso_stub(api_fixture('api_client_authorizations')['project_viewer_trustedclient']['api_token'])
 
     find("#notifications-menu").click
     assert_text "active-user@arvados.local"
@@ -58,8 +61,7 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
 
   test "Use this login to access another account" do
     visit page_with_token('project_viewer_trustedclient')
-    stub = start_sso_stub(api_fixture('api_client_authorizations')['active_trustedclient']['api_token'])
-    Rails.configuration.arvados_login_base = stub + "login"
+    Rails.configuration.testing_override_login_url = start_sso_stub(api_fixture('api_client_authorizations')['active_trustedclient']['api_token'])
 
     find("#notifications-menu").click
     assert_text "project-viewer@arvados.local"
@@ -78,8 +80,7 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
 
   test "Link login of inactive user to this account" do
     visit page_with_token('active_trustedclient')
-    stub = start_sso_stub(api_fixture('api_client_authorizations')['inactive_uninvited_trustedclient']['api_token'])
-    Rails.configuration.arvados_login_base = stub + "login"
+    Rails.configuration.testing_override_login_url = start_sso_stub(api_fixture('api_client_authorizations')['inactive_uninvited_trustedclient']['api_token'])
 
     find("#notifications-menu").click
     assert_text "active-user@arvados.local"
@@ -98,8 +99,7 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
 
   test "Cannot link to inactive user" do
     visit page_with_token('active_trustedclient')
-    stub = start_sso_stub(api_fixture('api_client_authorizations')['inactive_uninvited_trustedclient']['api_token'])
-    Rails.configuration.arvados_login_base = stub + "login"
+    Rails.configuration.testing_override_login_url = start_sso_stub(api_fixture('api_client_authorizations')['inactive_uninvited_trustedclient']['api_token'])
 
     find("#notifications-menu").click
     assert_text "active-user@arvados.local"
@@ -122,8 +122,7 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
 
   test "Inactive user can link to active account" do
     visit page_with_token('inactive_uninvited_trustedclient')
-    stub = start_sso_stub(api_fixture('api_client_authorizations')['active_trustedclient']['api_token'])
-    Rails.configuration.arvados_login_base = stub + "login"
+    Rails.configuration.testing_override_login_url = start_sso_stub(api_fixture('api_client_authorizations')['active_trustedclient']['api_token'])
 
     find("#notifications-menu").click
     assert_text "inactive-uninvited-user@arvados.local"
@@ -147,8 +146,7 @@ class LinkAccountTest < ActionDispatch::IntegrationTest
 
   test "Admin cannot link to non-admin" do
     visit page_with_token('admin_trustedclient')
-    stub = start_sso_stub(api_fixture('api_client_authorizations')['active_trustedclient']['api_token'])
-    Rails.configuration.arvados_login_base = stub + "login"
+    Rails.configuration.testing_override_login_url = start_sso_stub(api_fixture('api_client_authorizations')['active_trustedclient']['api_token'])
 
     find("#notifications-menu").click
     assert_text "admin@arvados.local"