[ARVADOS] updated: a124a5350d31001a7c66381fa853dfcd78dddd06

[git at public.curoverse.com]

Summary of changes:
 .../workbench/test/integration/collections_test.rb | 28 ++++++++++++++++++++++
 services/api/test/fixtures/collections.yml         | 12 ++++++++++
 services/nodemanager/arvnodeman/daemon.py          |  4 ++--
 services/nodemanager/tests/test_daemon.py          |  7 ++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

       via  a124a5350d31001a7c66381fa853dfcd78dddd06 (commit)
       via  3ca013aedeae5b2085b8fb37ca80501117f0f918 (commit)
       via  a8b3df3d2c5fa8fa66484d6bb0d20a37a0863d90 (commit)
      from  3bf2514da60ab2e0b7639959b650cc4d93784080 (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 a124a5350d31001a7c66381fa853dfcd78dddd06
Merge: 3ca013a a8b3df3
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 22 19:38:11 2014 -0400

    Merge branch 'master' into 4228-collection-subdir-files


commit 3ca013aedeae5b2085b8fb37ca80501117f0f918
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 22 19:12:55 2014 -0400

    4228: add test for combining files from a collection subdir.

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index f62f285..726c20a 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -147,4 +147,32 @@ class CollectionsTest < ActionDispatch::IntegrationTest
       headless.stop
     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
 end
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index c481424..045e1c7 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -267,6 +267,18 @@ collection_to_remove_from_subproject:
   created_at: 2014-10-15T10:45:00
   name: Collection to remove from subproject
 
+collection_with_files_in_subdir:
+  uuid: zzzzz-4zz18-filesinsubdir00
+  name: collection_files_in_subdir
+  portable_data_hash: 85877ca2d7e05498dd3d109baf2df106+95
+  owner_uuid: zzzzz-tpzed-user1withloadab
+  created_at: 2014-02-03T17:22:54Z
+  modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+  modified_by_user_uuid: zzzzz-tpzed-user1withloadab
+  modified_at: 2014-02-03T17:22:54Z
+  updated_at: 2014-02-03T17:22:54Z
+  manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:95:file_in_subdir1\n./subdir2/subdir3 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64 at 545a9920 0:32:file1_in_subdir3.txt 32:32:file2_in_subdir3.txt\n./subdir2/subdir3/subdir4 2bbc341c702df4d8f42ec31f16c10120+64+A315d7e7bad2ce937e711fc454fae2d1194d14d64 at 545a9920 0:32:file1_in_subdir4.txt 32:32:file2_in_subdir4.txt"
+
 # Test Helper trims the rest of the file
 
 # Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper

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


hooks/post-receive
--