[ARVADOS] updated: c5fd3fb6be57c79f7a55e0fe6a1d3f329d82a7b5

git at public.curoverse.com git at public.curoverse.com
Thu Nov 20 12:49:45 EST 2014


Summary of changes:
 services/api/app/models/user.rb                                |  3 +--
 services/api/lib/current_api_client.rb                         |  2 +-
 services/api/test/fixtures/collections.yml                     | 10 ++++++++++
 .../test/functional/arvados/v1/collections_controller_test.rb  |  6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)

       via  c5fd3fb6be57c79f7a55e0fe6a1d3f329d82a7b5 (commit)
       via  de758e3ecf76410ec43ad9f39fd9dbe750de637d (commit)
       via  4143b4814ff468765dffe8037567cb2dd54fd1af (commit)
       via  c33f4e367c8101c70c31645ede4ac12ce85947c9 (commit)
       via  33c4a5ab355904e900f72fb5d5a16396323ef7ec (commit)
      from  a63d484f26c644069a14434d8a5bfc16d95eb147 (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 c5fd3fb6be57c79f7a55e0fe6a1d3f329d82a7b5
Author: radhika <radhika at curoverse.com>
Date:   Thu Nov 20 12:29:54 2014 -0500

    4592: add fixture to be used by the api server test "search collections with 'any' operator".

diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index ffe0909..dff769a 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -345,6 +345,16 @@ collection_with_no_name_in_aproject:
   updated_at: 2014-04-21 15:37:48 -0400
   manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n"
 
+collection_to_search_for_in_aproject:
+  uuid: zzzzz-4zz18-abcd6fx123409f7
+  portable_data_hash: 1f4b0bc7583c2a7f910212345678c5e3+45
+  owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
+  created_at: 2014-04-21 15:37:48 -0400
+  modified_at: 2014-04-21 15:37:48 -0400
+  updated_at: 2014-04-21 15:37:48 -0400
+  manifest_text: ". juku76584cc2f85cedef654fjyhtgimh+3 0:3:foo\n"
+  name: "zzzzz-4zz18-abcd6fx123409f7 used to search with any"
+
 # 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
diff --git a/services/api/test/functional/arvados/v1/collections_controller_test.rb b/services/api/test/functional/arvados/v1/collections_controller_test.rb
index 0862176..4144ebf 100644
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -347,12 +347,12 @@ EOS
   test "search collections with 'any' operator" do
     authorize_with :active
     get :index, {
-      where: { any: ['contains', '7f9102c395f4ffc5e3'] }
+      where: { any: ['contains', '83c2a7f91021234567'] }
     }
     assert_response :success
     found = assigns(:objects).collect(&:portable_data_hash)
-    assert_equal 2, found.count
-    assert_equal true, !!found.index('1f4b0bc7583c2a7f9102c395f4ffc5e3+45')
+    assert_equal 1, found.count
+    assert_equal true, !!found.index('1f4b0bc7583c2a7f910212345678c5e3+45')
   end
 
   [false, true].each do |permit_unsigned|

commit de758e3ecf76410ec43ad9f39fd9dbe750de637d
Merge: 33c4a5a 4143b48
Author: radhika <radhika at curoverse.com>
Date:   Thu Nov 20 11:59:29 2014 -0500

    Merge branch 'master' into 4592-input-selection


commit 33c4a5ab355904e900f72fb5d5a16396323ef7ec
Merge: a63d484 c33f4e3
Author: radhika <radhika at curoverse.com>
Date:   Thu Nov 20 11:46:41 2014 -0500

    Merge branch 'master' into 4592-input-selection


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list