[ARVADOS] updated: 5b953441aba0b15851ef0821d08dc2933216eac2

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb         | 1 -
 apps/workbench/app/views/collections/_show_hash_matches.html.erb | 1 +
 apps/workbench/test/integration/collections_test.rb              | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

       via  5b953441aba0b15851ef0821d08dc2933216eac2 (commit)
      from  648bcf7dda3a68d09bec6f7d6473c8996697f7cd (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 5b953441aba0b15851ef0821d08dc2933216eac2
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Apr 27 09:30:47 2015 -0400

    5622: one more test assertion for tab_counts for hash matches tab.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index badb38a..ccf84ae 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -195,7 +195,6 @@ class CollectionsController < ApplicationController
 
     # Hash_matches page
     if params[:partial].andand.eql?('contents_rows')
-      @limit = 50
       find_objects_for_index
 
       owners = @objects.map(&:owner_uuid).to_a.uniq
diff --git a/apps/workbench/app/views/collections/_show_hash_matches.html.erb b/apps/workbench/app/views/collections/_show_hash_matches.html.erb
index 4010dd3..19afaea 100644
--- a/apps/workbench/app/views/collections/_show_hash_matches.html.erb
+++ b/apps/workbench/app/views/collections/_show_hash_matches.html.erb
@@ -1,3 +1,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
+    limit: 50,
     filters: [["portable_data_hash", "=", @object.portable_data_hash]]
     }.merge(local_assigns) %>
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 25998cc..57b5584 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -232,6 +232,9 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     matches = api_fixture('collections').select {|k,v| v["portable_data_hash"] == pdh}
     assert matches.size > 1
 
+    match = /Hash matches \(\d+\)/.match page.text
+    assert match, 'Expected hash matches tab title was not found'
+
     (0..10).each do
       within(".arv-collection-Hash_matches") do
         page.execute_script "window.scrollBy(0,999000)"

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


hooks/post-receive
--