From 9446f96840126285dcdda931abbd8a3ca4d9c77f Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 16 Dec 2022 16:08:26 -0500 Subject: [PATCH] 19880: Fix tests Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- apps/workbench/test/controllers/users_controller_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/workbench/test/controllers/users_controller_test.rb b/apps/workbench/test/controllers/users_controller_test.rb index 742fe6b13e..f1fc58875a 100644 --- a/apps/workbench/test/controllers/users_controller_test.rb +++ b/apps/workbench/test/controllers/users_controller_test.rb @@ -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 -- 2.30.2