projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11642-null-job-log' refs #11642
[arvados.git]
/
services
/
api
/
test
/
functional
/
arvados
/
v1
/
repositories_controller_test.rb
diff --git
a/services/api/test/functional/arvados/v1/repositories_controller_test.rb
b/services/api/test/functional/arvados/v1/repositories_controller_test.rb
index 71b528e72afd9467539f2136d3163481e582b956..56dd57ce7c64dd4697279ce3332ccd86546c99ef 100644
(file)
--- a/
services/api/test/functional/arvados/v1/repositories_controller_test.rb
+++ b/
services/api/test/functional/arvados/v1/repositories_controller_test.rb
@@
-43,9
+43,8
@@
class Arvados::V1::RepositoriesControllerTest < ActionController::TestCase
end
test "get_all_permissions takes into account is_active flag" do
end
test "get_all_permissions takes into account is_active flag" do
- r = nil
act_as_user users(:active) do
act_as_user users(:active) do
-
r =
Repository.create! name: 'active/testrepo'
+ Repository.create! name: 'active/testrepo'
end
act_as_system_user do
u = users(:active)
end
act_as_system_user do
u = users(:active)
@@
-170,19
+169,19
@@
class Arvados::V1::RepositoriesControllerTest < ActionController::TestCase
u = User.find_by_uuid(user_uuid)
if perms['can_read']
assert u.can? read: repo['uuid']
u = User.find_by_uuid(user_uuid)
if perms['can_read']
assert u.can? read: repo['uuid']
- assert_match
/R/, perms['gitolite_permissions']
+ assert_match
(/R/, perms['gitolite_permissions'])
else
else
- refute_match
/R/, perms['gitolite_permissions']
+ refute_match
(/R/, perms['gitolite_permissions'])
end
if perms['can_write']
assert u.can? write: repo['uuid']
end
if perms['can_write']
assert u.can? write: repo['uuid']
- assert_match
/RW\+/, perms['gitolite_permissions']
+ assert_match
(/RW\+/, perms['gitolite_permissions'])
else
else
- refute_match
/W/, perms['gitolite_permissions']
+ refute_match
(/W/, perms['gitolite_permissions'])
end
if perms['can_manage']
assert u.can? manage: repo['uuid']
end
if perms['can_manage']
assert u.can? manage: repo['uuid']
- assert_match
/RW\+/, perms['gitolite_permissions']
+ assert_match
(/RW\+/, perms['gitolite_permissions'])
end
end
end
end
end
end