19880: Fix tests
authorPeter Amstutz <peter.amstutz@curii.com>
Fri, 16 Dec 2022 21:08:26 +0000 (16:08 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Fri, 16 Dec 2022 21:08:26 +0000 (16:08 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

apps/workbench/test/controllers/users_controller_test.rb

index 742fe6b13e1c3ed5b0a4a7ff7e720bc8f6874565..f1fc58875a1215ca6f50625fb07a1d3b39bc5d13 100644 (file)
@@ -14,17 +14,18 @@ class UsersControllerTest < ActionController::TestCase
   test "ignore previously valid token (for deleted user), don't crash" do
     get :activity, params: {}, session: session_for(:valid_token_deleted_user)
     assert_response :redirect
-    assert_match /^#{Rails.configuration.Services.Controller.ExternalURL}\/login/, @response.redirect_url
+    assert_match /^#{Rails.configuration.Services.Workbench1.ExternalURL}users\/welcome/, @response.redirect_url
     assert_nil assigns(:my_jobs)
     assert_nil assigns(:my_ssh_keys)
   end
 
   test "expired token redirects to api server login" do
+    assert Rails.configuration.Login.Test.Enable
     get :show, params: {
       id: api_fixture('users')['active']['uuid']
     }, session: session_for(:expired_trustedclient)
     assert_response :redirect
-    assert_match /^#{Rails.configuration.Services.Controller.ExternalURL}\/login/, @response.redirect_url
+    assert_match /^#{Rails.configuration.Services.Workbench1.ExternalURL}users\/welcome/, @response.redirect_url
     assert_nil assigns(:my_jobs)
     assert_nil assigns(:my_ssh_keys)
   end