[ARVADOS] updated: 015be61473c9ed23174834166961d7f76b21fd91

[git at public.curoverse.com]

Summary of changes:
 services/api/test/fixtures/groups.yml                             | 8 +++++++-
 services/api/test/functional/arvados/v1/groups_controller_test.rb | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

       via  015be61473c9ed23174834166961d7f76b21fd91 (commit)
      from  f09b538f62240646f7715543f66ecf521241fd78 (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 015be61473c9ed23174834166961d7f76b21fd91
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 25 21:33:57 2014 -0400

    Fix test fixtures breaking Workbench tests. refs #3171

diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index a3a6fdc..c0fc79e 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -3,18 +3,21 @@ public:
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
   name: Public
   description: Public Group
+  group_class: role
 
 private:
   uuid: zzzzz-j7d0g-rew6elm53kancon
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   name: Private
   description: Private Group
+  group_class: role
 
 private_and_can_read_foofile:
   uuid: zzzzz-j7d0g-22xp1wpjul508rk
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   name: Private and Can Read Foofile
   description: Another Private Group
+  group_class: role
 
 activeandfriends:
   uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
@@ -26,13 +29,14 @@ activeandfriends:
   name: Active User and friends
   description:
   updated_at: 2014-08-22 14:02:18.481166435 Z
-  group_class:
+  group_class: role
 
 system_owned_group:
   uuid: zzzzz-j7d0g-8ulrifv67tve5sx
   owner_uuid: zzzzz-tpzed-000000000000000
   name: System Private
   description: System-owned Group
+  group_class: role
 
 system_group:
   uuid: zzzzz-j7d0g-000000000000000
@@ -45,6 +49,7 @@ empty_lonely_group:
   owner_uuid: zzzzz-tpzed-000000000000000
   name: Empty
   description: Empty Group
+  group_class: role
 
 all_users:
   uuid: zzzzz-j7d0g-fffffffffffffff
@@ -90,6 +95,7 @@ future_project_viewing_group:
   updated_at: 2014-04-21 15:37:48 -0400
   name: Future Project Viewing Group
   description: "Group used to test granting Group Project viewing"
+  group_class: role
 
 bad_group_has_ownership_cycle_a:
   uuid: zzzzz-j7d0g-cx2al9cqkmsf1hs
diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index b755bb7..e1cfbd7 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -31,11 +31,11 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
 
   test "get list of groups that are not projects" do
     authorize_with :active
-    get :index, filters: [['group_class', '=', nil]], format: :json
+    get :index, filters: [['group_class', '!=', 'project']], format: :json
     assert_response :success
     group_uuids = []
     json_response['items'].each do |group|
-      assert_equal nil, group['group_class']
+      assert_not_equal 'project', group['group_class']
       group_uuids << group['uuid']
     end
     assert_not_includes group_uuids, groups(:aproject).uuid

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


hooks/post-receive
--