[ARVADOS] updated: 0850fa67a98dd28536312b1c4388b43eceba7b89
git at public.curoverse.com
git at public.curoverse.com
Fri Aug 8 13:17:37 EDT 2014
Summary of changes:
.../app/controllers/application_controller.rb | 7 +-
.../app/controllers/projects_controller.rb | 41 +++++++++--
.../workbench/app/controllers/search_controller.rb | 7 +-
apps/workbench/app/models/user.rb | 6 +-
.../app/views/application/_content.html.erb | 21 ------
.../views/application/_projects_tree_menu.html.erb | 9 +--
apps/workbench/app/views/layouts/body.html.erb | 21 ++++--
.../app/views/projects/_index_projects.html.erb | 8 ++-
.../views/projects/_show_data_collections.html.erb | 32 +++++----
apps/workbench/app/views/projects/index.html.erb | 7 +-
sdk/python/arvados/commands/put.py | 38 +++++-----
sdk/python/tests/test_arv_put.py | 81 +++++++++++++---------
sdk/python/tests/test_keep_client.py | 45 ++++++------
.../controllers/arvados/v1/groups_controller.rb | 17 ++++-
services/api/app/models/user.rb | 4 +-
services/api/config/application.default.yml | 2 +-
services/api/test/fixtures/links.yml | 18 ++++-
.../arvados/v1/groups_controller_test.rb | 18 +++++
.../functional/arvados/v1/users_controller_test.rb | 22 +++---
services/api/test/unit/user_test.rb | 8 +--
20 files changed, 252 insertions(+), 160 deletions(-)
via 0850fa67a98dd28536312b1c4388b43eceba7b89 (commit)
via da85b5f1617656e03535dc490f027d7fae4d702e (commit)
via bda338bf2fd3bac648fad00e4646ff574510956f (commit)
via 1076b57c3d701df3ceaa4d54973ccc533729f097 (commit)
via 2d96a5bd256fc82dc274333ddaa4395016037170 (commit)
via b75aa879bc2035b5ac07ec3c389b4898194a03d7 (commit)
via 299396a4e79e5e5f6e5519898f563cd19bac6431 (commit)
via b2800c21fc219f26066d531b2082dac0d377e7f4 (commit)
via a69da9e1aaa4e80209d21fba82e79d02b90222c0 (commit)
via 4e5e843708a52e8587344be28269e14d7ad41409 (commit)
via 21be87a976a7234e1a69e7f2a61c43c80e90b804 (commit)
via 61e0cea2c42441dcdedd3776ca4520c8079eaa4b (commit)
via 7f15a960d533ae692112d90e79bfa1a69f4dd27f (commit)
via 8e76d0a54757172747f93eaa797e6d1746f8cd32 (commit)
via 780560ca57ad92e01edd23301750b8c1623d41db (commit)
via b20cc78fe133ad073edaa1f07effa90297015e99 (commit)
via e940b6f9ddaaabb5c21f1d0b10754231e74df67f (commit)
via 5f24e9f419222574f16640448be2de731de584b8 (commit)
from 0cae143d67d3b45f2a945bd11d34da082a17b44c (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 0850fa67a98dd28536312b1c4388b43eceba7b89
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Aug 8 13:14:59 2014 -0400
Update tests and user setup methods. refs #3525
diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 0f4ea2a..4fc6204 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -161,7 +161,7 @@ class User < ArvadosModel
# delete repo_perms for this user
repo_perms = Link.where(tail_uuid: self.uuid,
link_class: 'permission',
- name: 'can_write')
+ name: 'can_manage')
repo_perms.each do |perm|
Link.delete perm
end
@@ -327,7 +327,7 @@ class User < ArvadosModel
repo_perm = Link.create(tail_uuid: self.uuid,
head_uuid: repo[:uuid],
link_class: 'permission',
- name: 'can_write')
+ name: 'can_manage')
logger.info { "repo permission: " + repo_perm[:uuid] }
return repo_perm
end
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index 7842392..5e95480 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -250,7 +250,7 @@ foo_repository_readable_by_spectator:
head_uuid: zzzzz-s0uqq-382brsig8rp3666
properties: {}
-foo_repository_writable_by_active:
+foo_repository_manageable_by_active:
uuid: zzzzz-o0j2j-8tdfjd8g0s4rn1k
owner_uuid: zzzzz-tpzed-000000000000000
created_at: 2014-01-24 20:42:26 -0800
@@ -260,7 +260,7 @@ foo_repository_writable_by_active:
updated_at: 2014-01-24 20:42:26 -0800
tail_uuid: zzzzz-tpzed-xurymjxw79nv3jz
link_class: permission
- name: can_write
+ name: can_manage
head_uuid: zzzzz-s0uqq-382brsig8rp3666
properties: {}
diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index cdbc79b..2836783 100644
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -121,7 +121,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
created['uuid'], created['email'], 'arvados#user', false, 'User'
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
repo_name, created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
@@ -158,7 +158,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
# arvados#user, repo link and link add user to 'All users' group
verify_num_links @all_links_at_start, 5
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
repo_name, created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
@@ -256,7 +256,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
'expecting inactive user email'
# expect repo and vm links
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
'test_repo', resp_obj['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login',
@@ -479,7 +479,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
created['uuid'], created['email'], 'arvados#user', false, 'User'
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
@@ -539,7 +539,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link response_items, 'arvados#user', true, 'permission', 'can_login',
created['uuid'], created['email'], 'arvados#user', false, 'User'
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
@@ -605,7 +605,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
'All users', created['uuid'], 'arvados#group', true, 'Group'
- verify_link response_items, 'arvados#repository', false, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', false, 'permission', 'can_manage',
'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login',
@@ -629,7 +629,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
'All users', created['uuid'], 'arvados#group', true, 'Group'
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
'new_repo', created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#virtualMachine', false, 'permission', 'can_login',
@@ -657,7 +657,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
'All users', created['uuid'], 'arvados#group', true, 'Group'
# since no repo name in input, we won't get any; even though user has one
- verify_link response_items, 'arvados#repository', false, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', false, 'permission', 'can_manage',
'new_repo', created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login',
@@ -689,7 +689,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link response_items, 'arvados#group', true, 'permission', 'can_read',
'All users', created['uuid'], 'arvados#group', true, 'Group'
- verify_link response_items, 'arvados#repository', true, 'permission', 'can_write',
+ verify_link response_items, 'arvados#repository', true, 'permission', 'can_manage',
'test_repo', created['uuid'], 'arvados#repository', true, 'Repository'
verify_link response_items, 'arvados#virtualMachine', true, 'permission', 'can_login',
@@ -963,8 +963,8 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
end
repo_perms = Link.where(tail_uuid: uuid,
- link_class: 'permission',
- name: 'can_write').where("head_uuid like ?", Repository.uuid_like_pattern)
+ link_class: 'permission',
+ name: 'can_manage').where("head_uuid like ?", Repository.uuid_like_pattern)
if expect_repo_perms
assert repo_perms.any?, "expected repo_perms"
else
diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb
index d4f2524..fb87172 100644
--- a/services/api/test/unit/user_test.rb
+++ b/services/api/test/unit/user_test.rb
@@ -204,7 +204,7 @@ class UserTest < ActiveSupport::TestCase
verify_link group_perm, 'permission', 'can_read', resp_user[:uuid], nil
repo_perm = find_obj_in_resp response, 'Link', 'arvados#repository'
- verify_link repo_perm, 'permission', 'can_write', resp_user[:uuid], nil
+ verify_link repo_perm, 'permission', 'can_manage', resp_user[:uuid], nil
vm_perm = find_obj_in_resp response, 'Link', 'arvados#virtualMachine'
verify_link vm_perm, 'permission', 'can_login', resp_user[:uuid], vm.uuid
@@ -246,7 +246,7 @@ class UserTest < ActiveSupport::TestCase
verify_link group_perm, 'permission', 'can_read', resp_user[:uuid], nil
repo_perm = find_obj_in_resp response, 'Link', 'arvados#repository'
- verify_link repo_perm, 'permission', 'can_write', resp_user[:uuid], nil
+ verify_link repo_perm, 'permission', 'can_manage', resp_user[:uuid], nil
vm_perm = find_obj_in_resp response, 'Link', 'arvados#virtualMachine'
verify_link vm_perm, 'permission', 'can_login', resp_user[:uuid], vm.uuid
@@ -286,7 +286,7 @@ class UserTest < ActiveSupport::TestCase
verify_link group_perm, 'permission', 'can_read', resp_user[:uuid], nil
repo_perm = find_obj_in_resp response, 'Link', 'arvados#repository'
- verify_link repo_perm, 'permission', 'can_write', resp_user[:uuid], nil
+ verify_link repo_perm, 'permission', 'can_manage', resp_user[:uuid], nil
# invoke setup again with a vm_uuid
vm = VirtualMachine.create
@@ -301,7 +301,7 @@ class UserTest < ActiveSupport::TestCase
verify_link group_perm, 'permission', 'can_read', resp_user[:uuid], nil
repo_perm = find_obj_in_resp response, 'Link', 'arvados#repository'
- verify_link repo_perm, 'permission', 'can_write', resp_user[:uuid], nil
+ verify_link repo_perm, 'permission', 'can_manage', resp_user[:uuid], nil
vm_perm = find_obj_in_resp response, 'Link', 'arvados#virtualMachine'
verify_link vm_perm, 'permission', 'can_login', resp_user[:uuid], vm.uuid
commit da85b5f1617656e03535dc490f027d7fae4d702e
Merge: 0cae143 bda338b
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Aug 8 11:44:50 2014 -0400
Merge branch '3499-home-project' closes #3499
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list