2872: Merge branch 'master' into 2872-folder-nav

[arvados.git] / 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 6e5389e7cc11d0a4d6c7c4808023476346e9c978..be7e4e15a5692d5b47ce433fb5647cbb7159bd29 100644 (file)
--- 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
@@ -13,10 +13,9 @@ class LoginsTest < ActionDispatch::IntegrationTest
   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'
+    assert page.has_text? ' Log in Oh... fiddlesticks. Sorry, I had some trouble handling your request'
   end
 end