[ARVADOS] updated: da34478ce3e42df6d138c6e6e1db7c49d9d5902c

git at public.curoverse.com git at public.curoverse.com
Mon Aug 25 14:18:32 EDT 2014


Summary of changes:
 .../app/controllers/application_controller.rb      |   2 +-
 services/api/Gemfile                               |   1 +
 services/api/Gemfile.lock                          |   6 +
 .../api/app/controllers/application_controller.rb  |  37 +++---
 .../arvados/v1/collections_controller.rb           |  10 +-
 .../app/controllers/arvados/v1/users_controller.rb |  19 +--
 services/api/app/models/arvados_model.rb           | 108 ++++++++--------
 services/api/app/models/link.rb                    |  15 +--
 services/api/app/models/user.rb                    |   9 +-
 services/api/lib/current_api_client.rb             |  16 ++-
 services/api/test/factories/api_client.rb          |  10 ++
 .../api/test/factories/api_client_authorization.rb |  19 +++
 services/api/test/factories/group.rb               |   4 +
 services/api/test/factories/link.rb                |   7 ++
 services/api/test/factories/user.rb                |  44 +++++++
 services/api/test/fixtures/groups.yml              |  12 ++
 services/api/test/fixtures/links.yml               |  56 +++++++++
 .../functional/arvados/v1/links_controller_test.rb |  20 +--
 .../functional/arvados/v1/users_controller_test.rb |  85 +++++++------
 services/api/test/integration/select_test.rb       |   3 +-
 services/api/test/test_helper.rb                   |  12 +-
 services/api/test/unit/link_test.rb                |   4 +-
 services/api/test/unit/permission_test.rb          | 138 +++++++++++++++++++++
 23 files changed, 479 insertions(+), 158 deletions(-)
 create mode 100644 services/api/test/factories/api_client.rb
 create mode 100644 services/api/test/factories/api_client_authorization.rb
 create mode 100644 services/api/test/factories/group.rb
 create mode 100644 services/api/test/factories/link.rb
 create mode 100644 services/api/test/factories/user.rb

       via  da34478ce3e42df6d138c6e6e1db7c49d9d5902c (commit)
       via  7c2d7b25747a06919e8ec64f0b4391c33092d965 (commit)
       via  5674ba0e4490b53a0088cfd1181c6e1783124217 (commit)
       via  a3b9c1877a13f4c665020336584acafe43478650 (commit)
       via  62d9e76aab5c3e6c8863b1e1f42cf6d2153cdb93 (commit)
       via  3ef0016f85290758f286b6026fbd1a2d0c11ad4e (commit)
       via  42a27c7cabdacb00bd5a9ba06443c8a72322738b (commit)
       via  779547997857b04c27e5df52f70d527fcaa7a551 (commit)
       via  754d85439d5e9a835562689dee597b782932914f (commit)
      from  94b5a59631f22e4e57561a6244c24b93db77f589 (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 da34478ce3e42df6d138c6e6e1db7c49d9d5902c
Merge: 94b5a59 7c2d7b2
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 25 14:16:11 2014 -0400

    Merge branch '3171-group-membership' refs #3171


commit 7c2d7b25747a06919e8ec64f0b4391c33092d965
Merge: 5674ba0 94b5a59
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 25 14:15:57 2014 -0400

    3171: Merge branch 'master' into 3171-group-membership
    
    Conflicts:
    	services/api/test/fixtures/links.yml

diff --cc services/api/test/fixtures/links.yml
index 676e9d9,abeab28..2606d86
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@@ -708,58 -708,16 +708,72 @@@ empty_collection_name_in_active_user_ho
    properties: {}
    updated_at: 2014-08-06 22:11:51.242010312 Z
  
 +active_user_can_read_activeandfriends:
 +  uuid: zzzzz-o0j2j-8184f5vk8c851ts
 +  owner_uuid: zzzzz-tpzed-000000000000000
 +  created_at: 2014-08-22 14:03:46.321059945 Z
 +  modified_by_client_uuid:
 +  modified_by_user_uuid: zzzzz-tpzed-000000000000000
 +  modified_at: 2014-08-22 14:03:46.320865926 Z
 +  tail_uuid: zzzzz-tpzed-xurymjxw79nv3jz
 +  link_class: permission
 +  name: can_read
 +  head_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
 +  properties: {}
 +  updated_at: 2014-08-22 14:03:46.320743213 Z
 +
 +active_user_joined_activeandfriends:
 +  uuid: zzzzz-o0j2j-t63rdd7vupqvnco
 +  owner_uuid: zzzzz-tpzed-000000000000000
 +  created_at: 2014-08-22 14:03:28.835064240 Z
 +  modified_by_client_uuid:
 +  modified_by_user_uuid: zzzzz-tpzed-000000000000000
 +  modified_at: 2014-08-22 14:03:28.834849409 Z
 +  tail_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
 +  link_class: permission
 +  name: can_read
 +  head_uuid: zzzzz-tpzed-xurymjxw79nv3jz
 +  properties: {}
 +  updated_at: 2014-08-22 14:03:28.834720558 Z
 +
 +future_project_can_read_activeandfriends:
 +  uuid: zzzzz-o0j2j-bkdtnddpmwxqiza
 +  owner_uuid: zzzzz-tpzed-000000000000000
 +  created_at: 2014-08-22 14:04:18.811622057 Z
 +  modified_by_client_uuid:
 +  modified_by_user_uuid: zzzzz-tpzed-000000000000000
 +  modified_at: 2014-08-22 14:04:18.811463859 Z
 +  tail_uuid: zzzzz-tpzed-futureprojview2
 +  link_class: permission
 +  name: can_read
 +  head_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
 +  properties: {}
 +  updated_at: 2014-08-22 14:04:18.811387314 Z
 +
 +future_project_user_joined_activeandfriends:
 +  uuid: zzzzz-o0j2j-ksl8bo92eokv332
 +  owner_uuid: zzzzz-tpzed-000000000000000
 +  created_at: 2014-08-22 14:04:24.182103355 Z
 +  modified_by_client_uuid:
 +  modified_by_user_uuid: zzzzz-tpzed-000000000000000
 +  modified_at: 2014-08-22 14:04:24.181939129 Z
 +  tail_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
 +  link_class: permission
 +  name: can_read
 +  head_uuid: zzzzz-tpzed-futureprojview2
 +  properties: {}
 +  updated_at: 2014-08-22 14:04:24.181799856 Z
++
+ auto_setup_vm_login_username_can_login_to_test_vm:
+   uuid: zzzzz-o0j2j-i3n6m98766tmoi4
+   owner_uuid: zzzzz-tpzed-xabcdjxw79nv3jz
+   created_at: 2014-08-06 22:11:51.242392533 Z
+   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+   modified_by_user_uuid: zzzzz-tpzed-xabcdjxw79nv3jz
+   modified_at: 2014-08-06 22:11:51.242150425 Z
+   tail_uuid: zzzzz-tpzed-xabcdjxw79nv3jz
+   link_class: permission
+   name: can_login
+   head_uuid: zzzzz-2x53u-382brsig8rp3064
+   properties: {username: 'auto_setup_vm_login'}
+   updated_at: 2014-08-06 22:11:51.242010312 Z

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list