[ARVADOS] updated: 017f264a219a10fb218854a37299cce1cff4ff32

[git at public.curoverse.com]

Summary of changes:
 .../test/controllers/actions_controller_test.rb         |  4 ++--
 services/api/test/fixtures/collections.yml              | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

       via  017f264a219a10fb218854a37299cce1cff4ff32 (commit)
      from  f747bc4aa9dfc2647986d7ce81e3e5c4da9d41d7 (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 017f264a219a10fb218854a37299cce1cff4ff32
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Mar 9 22:31:51 2015 -0400

    5145: revert back fixture update and instead add a new fixture for test combining of collections.

diff --git a/apps/workbench/test/controllers/actions_controller_test.rb b/apps/workbench/test/controllers/actions_controller_test.rb
index 4f33038..d8c17c9 100644
--- a/apps/workbench/test/controllers/actions_controller_test.rb
+++ b/apps/workbench/test/controllers/actions_controller_test.rb
@@ -21,7 +21,7 @@ class ActionsControllerTest < ActionController::TestCase
            selection: ['zzzzz-4zz18-znfnqtbbv4spc3w/foo',
                        'zzzzz-4zz18-ehbhgtheo8909or/bar',
                        'zzzzz-4zz18-y9vne9npefyxh8g/baz',
-                       '1fd08fc162a5c6413070a8bd0bffc818+150'],
+                       '7a6ef4c162a5c6413070a8bd0bffc818+150'],
            format: "json"},
          session_for(:active))
 
@@ -49,7 +49,7 @@ class ActionsControllerTest < ActionController::TestCase
                        'zzzzz-4zz18-abcd6fx123409f7/foo',
                        'zzzzz-4zz18-ehbhgtheo8909or/bar',
                        'zzzzz-4zz18-y9vne9npefyxh8g/baz',
-                       '1fd08fc162a5c6413070a8bd0bffc818+150'],
+                       '7a6ef4c162a5c6413070a8bd0bffc818+150'],
            format: "json"},
          session_for(:active))
 
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index b09dae4..bd508f8 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -79,7 +79,7 @@ multilevel_collection_1:
   modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
   modified_at: 2014-02-03T17:22:54Z
   updated_at: 2014-02-03T17:22:54Z
-  manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n./dir1 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n./dir1/subdir 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n./dir2 85877ca2d7e05498dd3d109baf2df106+95+A3a4e26a366ee7e4ed3e476ccf05354761be2e4ae at 545a9920 0:0:file1 0:0:file2 0:0:file3\n"
+  manifest_text: ". 0:0:file1 0:0:file2 0:0:file3\n./dir1 0:0:file1 0:0:file2 0:0:file3\n./dir1/subdir 0:0:file1 0:0:file2 0:0:file3\n./dir2 0:0:file1 0:0:file2 0:0:file3\n"
   name: multilevel_collection_1
 
 multilevel_collection_2:
@@ -470,7 +470,7 @@ collection_with_one_property:
   properties:
     property1: value1
 
-# The following three collections are used to test combining collections with repeated filenames
+# The following four collections are used to test combining collections with repeated filenames
 collection_with_repeated_filenames_and_contents_in_two_dirs_1:
   uuid: zzzzz-4zz18-duplicatenames1
   portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
@@ -507,6 +507,19 @@ foo_and_bar_files_in_dir:
   name: foo_file_in_dir
   manifest_text: "./dir1 a84b928ebdbae3f658518c711beaec02+28+A0cff02249e70e8cd6e55dba49fef4afa3f5bfdfb at 550acd28 0:3:bar 12:16:foo\n"
 
+multi_level_to_combine:
+  uuid: zzzzz-4zz18-pyw8yp9g3ujh45f
+  portable_data_hash: 7a6ef4c162a5c6413070a8bd0bffc818+150
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  created_at: 2014-02-03T17:22:54Z
+  modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+  modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+  modified_at: 2014-02-03T17:22:54Z
+  updated_at: 2014-02-03T17:22:54Z
+  manifest_text: ". 85877ca2d7e05498dd3d109baf2df106+95 0:0:file1 0:0:file2 0:0:file3\n./dir1 85877ca2d7e05498dd3d109baf2df106+95 0:0:file1 0:0:file2 0:0:file3\n./dir1/subdir 85877ca2d7e05498dd3d109baf2df106+95 0:0:file1 0:0:file2 0:0:file3\n./dir2 85877ca2d7e05498dd3d109baf2df106+95 0:0:file1 0:0:file2 0:0:file3\n"
+  name: multi_level_to_combine
+
+
 # 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
--