19880: Fix tests by restoring test hook

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 25a4e74b70ca405fd8f3b8e760897ba8197d53ca..2abcf49e5742a0fb5a9c7d15a16291787fc7498e 100644 (file)
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -235,6 +235,13 @@ class ArvadosApiClient
   end
 
   def arvados_login_url(params={})
+    if Rails.configuration.testing_override_login_url
+      uri = URI(Rails.configuration.testing_override_login_url)
+      uri.path = "/login"
+      uri.query = URI.encode_www_form(params)
+      return uri.to_s
+    end
+
     case
     when Rails.configuration.Login.PAM.Enable,
          Rails.configuration.Login.LDAP.Enable,
@@ -245,9 +252,6 @@ class ArvadosApiClient
       uri.query = URI.encode_www_form(params)
     else
       uri = URI.parse(Rails.configuration.Services.Controller.ExternalURL.to_s)
-      if Rails.configuration.testing_override_login_url
-        uri = URI(Rails.configuration.testing_override_login_url)
-      end
       uri.path = "/login"
       uri.query = URI.encode_www_form(params)
     end