[ARVADOS] updated: 5ae6e2855194ecb5700e165b1d3796a385d4f507

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/functional/users_controller_test.rb    | 3 ++-
 apps/workbench/test/integration/logins_test.rb             | 4 ++--
 apps/workbench/test/integration/pipeline_instances_test.rb | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

       via  5ae6e2855194ecb5700e165b1d3796a385d4f507 (commit)
      from  192de21f18038794b56a1a0ec95c76e8e0eb1309 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5ae6e2855194ecb5700e165b1d3796a385d4f507
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 08:41:30 2014 -0400

    2872: update test to meet the current ui updates. the pipeline instances test still failing; possible error in ui where the Run button is enabled even when input is not provided.

diff --git a/apps/workbench/test/functional/users_controller_test.rb b/apps/workbench/test/functional/users_controller_test.rb
index 8b026cb..bf21a26 100644
--- 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 19b6e4b..be7e4e1 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
@@ -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 7d09c82..031fb8f 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--