X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0589ee6c2384e9a38720d67c8b86f5adf1d27902..e74ede4659428af77c50057d69a0d08e4e74a6ef:/apps/workbench/test/integration/logins_test.rb

diff --git a/apps/workbench/test/integration/logins_test.rb b/apps/workbench/test/integration/logins_test.rb
index 6e5389e7cc..9daf831810 100644
--- a/apps/workbench/test/integration/logins_test.rb
+++ b/apps/workbench/test/integration/logins_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'integration_helper'
 
 class LoginsTest < ActionDispatch::IntegrationTest
   test "login with api_token works after redirect" do
@@ -7,16 +7,12 @@ class LoginsTest < ActionDispatch::IntegrationTest
     assert_no_match(/\bapi_token=/, current_path)
   end
 
-  test "can't use expired token" do
+  test "trying to use expired token redirects to login page" do
     visit page_with_token('expired_trustedclient')
-    assert page.has_text? 'Log in'
-  end
-
-  test "expired token yields login page, not error page" do
-    skip
-    visit page_with_token('expired_trustedclient')
-    # Even the error page has a "Log in" link. We should look for
-    # something that only appears the real login page.
-    assert page.has_text? 'Please log in'
+    buttons = all("a.btn", text: /Log in/)
+    assert_equal(1, buttons.size, "Failed to find one login button")
+    login_link = buttons.first[:href]
+    assert_match(%r{//[^/]+/login}, login_link)
+    assert_no_match(/\bapi_token=/, login_link)
   end
 end