[ARVADOS] updated: 5a19b986fd10f0584b33eb5953e72bd373e487d2

[git at public.curoverse.com]

Summary of changes:
 .../api/app/controllers/application_controller.rb  |    4 ++-
 services/api/test/fixtures/groups.yml              |    6 ++++
 services/api/test/fixtures/links.yml               |   32 ++++++++++++++++++++
 .../arvados/v1/collections_controller_test.rb      |   13 +++++++-
 4 files changed, 53 insertions(+), 2 deletions(-)

       via  5a19b986fd10f0584b33eb5953e72bd373e487d2 (commit)
       via  d06f12a2866e92737f27a05a7782d67106edd2cf (commit)
       via  05d6c99e5b40c7e0792c44a7c2d9af5b91164f9b (commit)
       via  6b55fdd2cb5e1d6c43dd6df9c7af16a2da324f26 (commit)
       via  960a09a85db9fb7f38b8c4e1c93cf27a1d186d90 (commit)
       via  24a0882b04f95ee44fddcc94fab541486700a0dc (commit)
       via  33507442d1b24551985199ef453641f2c65a66e3 (commit)
      from  13b092de0b24b586fe2c8adf8cb0fb4eb3b62d4b (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 5a19b986fd10f0584b33eb5953e72bd373e487d2
Merge: 13b092d d06f12a
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Apr 2 12:40:08 2014 -0400

    Merge branch '2209-correct-items-available'
    
    closes #2209


commit d06f12a2866e92737f27a05a7782d67106edd2cf
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Apr 2 12:39:52 2014 -0400

    Fix counting results in test case (count != size for an ActiveRelation).

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 fdc0909..6990e97 100644
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -216,7 +216,7 @@ EOS
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
-    assert_equal 1, assigns(:objects).count
+    assert_equal 1, found.count
     assert_equal true, !!found.index('1f4b0bc7583c2a7f9102c395f4ffc5e3+45')
   end
 

commit 05d6c99e5b40c7e0792c44a7c2d9af5b91164f9b
Merge: 6b55fdd 13b092d
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Apr 2 12:30:44 2014 -0400

    Merge branch 'master' into 2209-correct-items-available


commit 6b55fdd2cb5e1d6c43dd6df9c7af16a2da324f26
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Apr 2 12:30:12 2014 -0400

    Really check for duplicate items returned, instead of just calling a
    variable unique_uuids.

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 9cbdc0b..5452e98 100644
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -27,7 +27,7 @@ class Arvados::V1::CollectionsControllerTest < ActionController::TestCase
     resp = JSON.parse(@response.body)
     assert_equal resp['items_available'], assigns(:objects).length
     assert_equal resp['items_available'], resp['items'].count
-    unique_uuids = resp['items'].collect { |i| i['uuid'] }.compact
+    unique_uuids = resp['items'].collect { |i| i['uuid'] }.compact.uniq
     assert_equal unique_uuids.count, resp['items'].count
   end
 

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


hooks/post-receive
--