[ARVADOS] updated: d599adb390dddea375cd8f79626678d0db5c2027

[git at public.curoverse.com]

Summary of changes:
 .../workbench/test/integration/collections_test.rb | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

       via  d599adb390dddea375cd8f79626678d0db5c2027 (commit)
      from  59807e4ab334f7aec9772bf63f186974fba96821 (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 d599adb390dddea375cd8f79626678d0db5c2027
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 20 11:39:13 2014 -0400

    4058: Tests for portable data hash redirection and multiple matches page.

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index f62f285..2847a3c 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -147,4 +147,30 @@ class CollectionsTest < ActionDispatch::IntegrationTest
       headless.stop
     end
   end
+
+  test "Collection portable data hash redirect" do
+    di = api_fixture('collections')['docker_image']
+    visit page_with_token('active', "/collections/#{di['portable_data_hash']}")
+
+    # check redirection
+    assert current_path.end_with?("/collections/#{di['uuid']}")
+    assert page.has_text?("docker_image")
+    assert page.has_text?("Activity")
+    assert page.has_text?("Sharing and permissions")
+  end
+
+  test "Collection portable data hash with multiple matches" do
+    pdh = api_fixture('collections')['baz_file']['portable_data_hash']
+    visit page_with_token('admin', "/collections/#{pdh}")
+
+    matches = api_fixture('collections').select {|k,v| v["portable_data_hash"] == pdh}
+    assert matches.size > 1
+
+    matches.each do |k,v|
+      assert page.has_link?(v["name"]), "Page /collections/#{pdh} should contain link '#{v['name']}'"
+    end
+    assert page.has_no_text?("Activity")
+    assert page.has_no_text?("Sharing and permissions")
+  end
+
 end

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


hooks/post-receive
--