Merge branch 'master' into 3882-cancel-already-cancelled-job

[arvados.git] / services / api / test / fixtures / groups.yml

diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index f0e2d0555d684bf167a62e3efb7a99654081a2dc..8f209e9b9c691b56da02c187aba8302932c0fe8e 100644 (file)
--- 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,19 +29,21 @@ activeandfriends:
   name: Active User and friends
   description:
   updated_at: 2014-08-22 14:02:18.481166435 Z
-  group_class:
+  group_class: role
 
 system_group:
   uuid: zzzzz-j7d0g-000000000000000
   owner_uuid: zzzzz-tpzed-000000000000000
   name: System Private
   description: System-owned Group
+  group_class: role
 
 empty_lonely_group:
   uuid: zzzzz-j7d0g-jtp06ulmvsezgyu
   owner_uuid: zzzzz-tpzed-000000000000000
   name: Empty
   description: Empty Group
+  group_class: role
 
 all_users:
   uuid: zzzzz-j7d0g-fffffffffffffff
@@ -84,6 +89,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
@@ -122,3 +128,12 @@ active_user_has_can_manage:
   uuid: zzzzz-j7d0g-ptt1ou6a9lxrv07
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
   name: Active user has can_manage
+
+# Group for testing granting permission between users who share a group.
+#
+group_for_sharing_tests:
+  uuid: zzzzz-j7d0g-t4ucgncwteul7zt
+  owner_uuid: zzzzz-tpzed-000000000000000
+  name: Group for sharing tests
+  description: Users who can share objects with each other
+  group_class: role