[ARVADOS] updated: 7149ee5d616b932a73fb7a311136e6db75020666

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/collections_controller.rb      | 90 ++++++++++++----------
 .../views/application/_title_and_buttons.html.erb  |  2 +-
 .../app/views/collections/hash_matches.html.erb    | 23 ++++++
 apps/workbench/app/views/collections/show.html.erb | 14 +---
 .../workbench/test/integration/collections_test.rb | 25 ++++++
 .../test/integration/pipeline_instances_test.rb    | 11 ++-
 apps/workbench/test/integration/projects_test.rb   | 20 +++++
 doc/api/methods/nodes.html.textile.liquid          |  2 +-
 .../app/controllers/arvados/v1/nodes_controller.rb |  7 --
 services/api/app/models/node.rb                    | 54 -------------
 services/api/config/application.default.yml        |  6 --
 .../functional/arvados/v1/nodes_controller_test.rb |  2 +-
 12 files changed, 132 insertions(+), 124 deletions(-)
 create mode 100644 apps/workbench/app/views/collections/hash_matches.html.erb

       via  7149ee5d616b932a73fb7a311136e6db75020666 (commit)
       via  1ed38089f9d9969abde1849743f0fdf52d3d2d93 (commit)
       via  34471863720a9e301be1604c2bd546627d435606 (commit)
       via  1a20f5f5423dfab4e03d267680da30125487425a (commit)
       via  4265a54aa0d505c5c35b9b290e2c6600a2766709 (commit)
       via  9feeea1226399a9fc28acc53eafc45d884f7db65 (commit)
       via  351895cf665a1cc26ab0f39fed696909331c99c4 (commit)
       via  91738b3c2331a102e4aefd4be580e0e979bc514f (commit)
       via  ea80735a2ea4067d682cde533565dc42920f8d5c (commit)
       via  2def202591164c9ade2c2b7ab6f67dc892d10557 (commit)
       via  11085f87c952c7e46a15c88e144190cac32b95a8 (commit)
       via  34a9171fa5b01bb206543576947c3300faac280a (commit)
       via  81cb0b6ac320caf7098c735ee06c610d73953ab5 (commit)
       via  c6056f6f1bb99fa10bc2046266accc4a85f66aad (commit)
       via  a008743d5471a30c96159b68ea60371a86ef4c0c (commit)
       via  789e1eb86b5286f3d34b112e0ab802bd3a2793b2 (commit)
       via  2556bf9a17d39e658f91cd9b180848526415ce92 (commit)
       via  d599adb390dddea375cd8f79626678d0db5c2027 (commit)
       via  59807e4ab334f7aec9772bf63f186974fba96821 (commit)
       via  12df2994c114b62b0d07a267fdeeaea389e5adb1 (commit)
      from  a124a5350d31001a7c66381fa853dfcd78dddd06 (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 7149ee5d616b932a73fb7a311136e6db75020666
Merge: a124a53 1ed3808
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 23 16:52:06 2014 -0400

    Merge branch 'master' into 4228-collection-subdir-files
    
    Conflicts:
    	apps/workbench/test/integration/collections_test.rb

diff --cc apps/workbench/test/integration/collections_test.rb
index 726c20a,2847a3c..625e481
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@@ -148,31 -148,29 +148,56 @@@ class CollectionsTest < ActionDispatch:
      end
    end
  
 +  test "combine selected collection files from collection subdirectory" do
 +    headless = Headless.new
 +    headless.start
 +    Capybara.current_driver = :selenium
 +
 +    visit page_with_token('user1_with_load', "/collections/zzzzz-4zz18-filesinsubdir00")
 +
 +    # now in collection page
 +    input_files = page.all('input[type=checkbox]')
 +    (0..input_files.count-1).each do |i|
 +      input_files[i].click
 +    end
 +
 +    click_button 'Selection...'
 +    within('.selection-action-container') do
 +      click_link 'Create new collection with selected files'
 +    end
 +
 +    # now in the newly created collection page
 +    assert(page.has_text?('file_in_subdir1'), 'file not found - file_in_subdir1')
 +    assert(page.has_text?('file1_in_subdir3.txt'), 'file not found - file1_in_subdir3.txt')
 +    assert(page.has_text?('file2_in_subdir3.txt'), 'file not found - file2_in_subdir3.txt')
 +    assert(page.has_text?('file1_in_subdir4.txt'), 'file not found - file1_in_subdir4.txt')
 +    assert(page.has_text?('file2_in_subdir4.txt'), 'file not found - file1_in_subdir4.txt')
 +
 +    headless.stop
 +  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
--