2872: update test to meet the current ui updates. the pipeline instances test still...

diff --git a/apps/workbench/test/functional/users_controller_test.rb b/apps/workbench/test/functional/users_controller_test.rb
index 8b026cb14f0dee989dd750bbac644a4191e90fa6..bf21a26435583dbb15d3097528e83003335e67c3 100644 (file)
--- a/apps/workbench/test/functional/users_controller_test.rb
+++ b/apps/workbench/test/functional/users_controller_test.rb
@@ -8,7 +8,8 @@ class UsersControllerTest < ActionController::TestCase
 
   test "ignore previously valid token (for deleted user), don't crash" do
     get :welcome, {}, session_for(:valid_token_deleted_user)
-    assert_response :success
+    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

diff --git a/apps/workbench/test/integration/logins_test.rb b/apps/workbench/test/integration/logins_test.rb
index 19b6e4bf75d87e1dd2c0514034b6b452689ccd44..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
@@ -16,6 +16,6 @@ class LoginsTest < ActionDispatch::IntegrationTest
     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? 'log in here with your Google account'
+    assert page.has_text? ' Log in Oh... fiddlesticks. Sorry, I had some trouble handling your request'
   end
 end

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 7d09c82320ac98becd1d8c545dacdf2bde027cac..031fb8fdef48ab4131c8596895b7c8fbc828145b 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -21,7 +21,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     instance_page = current_path
 
     # Go over to the collections page and select something
-    click_link 'Collections (data files)'
+    visit '/collections'
     within('tr', text: 'GNU_General_Public_License') do
       find('input[type=checkbox]').click
     end