10383: Merge branch 'master' into 10383-arv-put-incremental-upload

[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 187786d27d26b2aca858718e61af9ca67d92e303..0d6514d75d75901b5f3a9b78a1fffaeb057a2b77 100644 (file)
--- a/apps/workbench/test/integration/logins_test.rb
+++ b/apps/workbench/test/integration/logins_test.rb
@@ -2,20 +2,16 @@ require 'integration_helper'
 
 class LoginsTest < ActionDispatch::IntegrationTest
   setup do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
+    need_javascript
   end
 
   test "login with api_token works after redirect" do
     visit page_with_token('active_trustedclient')
-    assert page.has_text?('Recent jobs'), "Missing 'Recent jobs' from page"
+    assert page.has_text?('Recent pipelines and processes'), "Missing 'Recent pipelines and processes' from page"
     assert_no_match(/\bapi_token=/, current_path)
   end
 
   test "trying to use expired token redirects to login page" do
-    Capybara.current_driver = :rack_test
-
     visit page_with_token('expired_trustedclient')
     buttons = all("a.btn", text: /Log in/)
     assert_equal(1, buttons.size, "Failed to find one login button")