Merge branch 'master' into 3138-wiselinks

[arvados.git] / apps / workbench / test / functional / users_controller_test.rb

diff --git a/apps/workbench/test/functional/users_controller_test.rb b/apps/workbench/test/functional/users_controller_test.rb
index aadee36f656bfbd99bef0f113651b86f9701d2fc..86778df03607d3bdec23e81dabc0c804c6874457 100644 (file)
--- a/apps/workbench/test/functional/users_controller_test.rb
+++ b/apps/workbench/test/functional/users_controller_test.rb
@@ -1,9 +1,15 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  test "ignore previously valid token (for deleted user), don't crash" do
-    get :welcome, {}, session_for(:valid_token_deleted_user)
+  test "valid token works in functional test" do
+    get :index, {}, session_for(:active)
     assert_response :success
+  end
+
+  test "ignore previously valid token (for deleted user), don't crash" do
+    get :activity, {}, session_for(:valid_token_deleted_user)
+    assert_response :redirect
+    assert_match /^#{Rails.configuration.arvados_login_base}/, @response.redirect_url
     assert_nil assigns(:my_jobs)
     assert_nil assigns(:my_ssh_keys)
   end