[ARVADOS] updated: c54e3ca6bf62f1f4e41af25e920b49ee33c97805

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb |   10 +++++-----
 apps/workbench/test/integration/logins_test.rb  |    2 +-
 services/api/test/fixtures/collections.yml      |    2 +-
 services/api/test/fixtures/links.yml            |    8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

       via  c54e3ca6bf62f1f4e41af25e920b49ee33c97805 (commit)
      from  402461a12dbff7d0ec00c8446b925b021aabc2ed (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 c54e3ca6bf62f1f4e41af25e920b49ee33c97805
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 26 14:19:10 2014 -0400

    Added fix to workbench dashboard so that workbench integration tests pass.
    Added slightly helpful failure message to test assertion.
    Fixed non-normalized collection uuids in fixtures.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index bb38c7c..9e1c220 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -35,7 +35,7 @@
 
 	    <td>
 	      <small>
-		<% if j.success %>
+		<% if j.success and j.output %>
 
 		  <a href="<%= collection_path(j.output) %>">
 		    <% Collection.limit(1).where(uuid: j.output).each do |c| %>
@@ -162,7 +162,7 @@
         <span class="glyphicon glyphicon-search"></span>
         <% end %>
       </span>
-    </div>  
+    </div>
     <% end %>
   </div>
   <% if not current_user.andand.is_active or @my_collections.empty? %>
@@ -223,10 +223,10 @@
 	<p>
 	  Your account must be activated by an Arvados administrator.  If this
 	  is your first time accessing Arvados and would like to request
-	  access, or you believe you are seeing the page in error, please 
-	  <%= link_to "contact us", Rails.configuration.activation_contact_link %>.  
+	  access, or you believe you are seeing the page in error, please
+	  <%= link_to "contact us", Rails.configuration.activation_contact_link %>.
 	  You should receive an email at the address you used to log in when
-	  your account is activated.  In the mean time, you can 
+	  your account is activated.  In the mean time, you can
 	  <%= link_to "learn more about Arvados", "https://arvados.org/projects/arvados/wiki/Introduction_to_Arvados" %>,
 	  and <%= link_to "read the Arvados user guide", "http://doc.arvados.org/user" %>.
 	</p>
diff --git a/apps/workbench/test/integration/logins_test.rb b/apps/workbench/test/integration/logins_test.rb
index 84170dd..185d9cb 100644
--- a/apps/workbench/test/integration/logins_test.rb
+++ b/apps/workbench/test/integration/logins_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 class LoginsTest < ActionDispatch::IntegrationTest
   test "login with api_token works after redirect" do
     visit page_with_token('active_trustedclient')
-    assert page.has_text? 'Recent jobs'
+    assert page.has_text?('Recent jobs'), "Missing 'Recent jobs' from page"
     assert_no_match(/\bapi_token=/, current_path)
   end
 
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 85b02ae..ce05d18 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -1,5 +1,5 @@
 user_agreement:
-  uuid: b519d9cb706a29fc7ea24dbea2f05851
+  uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
   owner_uuid: qr1hi-tpzed-tpj2ff66551eyym
   created_at: 2013-12-26T19:22:54Z
   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index 25e60ad..4e10b56 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -11,7 +11,7 @@ user_agreement_required:
   link_class: signature
   name: require
   head_kind: arvados#collection
-  head_uuid: b519d9cb706a29fc7ea24dbea2f05851
+  head_uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
   properties: {}
 
 user_agreement_readable:
@@ -27,7 +27,7 @@ user_agreement_readable:
   link_class: permission
   name: can_read
   head_kind: arvados#collection
-  head_uuid: b519d9cb706a29fc7ea24dbea2f05851
+  head_uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
   properties: {}
 
 active_user_member_of_all_users_group:
@@ -75,7 +75,7 @@ user_agreement_signed_by_active:
   link_class: signature
   name: click
   head_kind: arvados#collection
-  head_uuid: b519d9cb706a29fc7ea24dbea2f05851
+  head_uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
   properties: {}
 
 user_agreement_signed_by_inactive:
@@ -91,7 +91,7 @@ user_agreement_signed_by_inactive:
   link_class: signature
   name: click
   head_kind: arvados#collection
-  head_uuid: b519d9cb706a29fc7ea24dbea2f05851
+  head_uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
   properties: {}
 
 spectator_user_member_of_all_users_group:

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


hooks/post-receive
--