projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16834-stale-run-lock'
[arvados.git]
/
services
/
api
/
test
/
functional
/
arvados
/
v1
/
users_controller_test.rb
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 817a1c9ef944eb38e2dc708d53a199a9e70e5e0f..ea5d5b1436bd256506cc1c23061dfd81eb8a763f 100644
(file)
--- a/
services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/
services/api/test/functional/arvados/v1/users_controller_test.rb
@@
-660,7
+660,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
test "non-admin user gets only safe attributes from users#show" do
g = act_as_system_user do
test "non-admin user gets only safe attributes from users#show" do
g = act_as_system_user do
- create :group
+ create :group
, group_class: "role"
end
users = create_list :active_user, 2, join_groups: [g]
token = create :token, user: users[0]
end
users = create_list :active_user, 2, join_groups: [g]
token = create :token, user: users[0]
@@
-672,7
+672,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
[2, 4].each do |limit|
test "non-admin user can limit index to #{limit}" do
g = act_as_system_user do
[2, 4].each do |limit|
test "non-admin user can limit index to #{limit}" do
g = act_as_system_user do
- create :group
+ create :group
, group_class: "role"
end
users = create_list :active_user, 4, join_groups: [g]
token = create :token, user: users[0]
end
users = create_list :active_user, 4, join_groups: [g]
token = create :token, user: users[0]
@@
-1039,9
+1039,12
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
test "batch update" do
existinguuid = 'remot-tpzed-foobarbazwazqux'
newuuid = 'remot-tpzed-newnarnazwazqux'
test "batch update" do
existinguuid = 'remot-tpzed-foobarbazwazqux'
newuuid = 'remot-tpzed-newnarnazwazqux'
+ unchanginguuid = 'remot-tpzed-nochangingattrs'
act_as_system_user do
User.create!(uuid: existinguuid, email: 'root@existing.example.com')
act_as_system_user do
User.create!(uuid: existinguuid, email: 'root@existing.example.com')
+ User.create!(uuid: unchanginguuid, email: 'root@unchanging.example.com', prefs: {'foo' => {'bar' => 'baz'}})
end
end
+ assert_equal(1, Log.where(object_uuid: unchanginguuid).count)
authorize_with(:admin)
patch(:batch_update,
authorize_with(:admin)
patch(:batch_update,
@@
-1059,6
+1062,10
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
'email' => 'root@remot.example.com',
'username' => '',
},
'email' => 'root@remot.example.com',
'username' => '',
},
+ unchanginguuid => {
+ 'email' => 'root@unchanging.example.com',
+ 'prefs' => {'foo' => {'bar' => 'baz'}},
+ },
}})
assert_response(:success)
}})
assert_response(:success)
@@
-1070,6
+1077,8
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
assert_equal('noot', User.find_by_uuid(newuuid).first_name)
assert_equal('root@remot.example.com', User.find_by_uuid(newuuid).email)
assert_equal('noot', User.find_by_uuid(newuuid).first_name)
assert_equal('root@remot.example.com', User.find_by_uuid(newuuid).email)
+
+ assert_equal(1, Log.where(object_uuid: unchanginguuid).count)
end
NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "email", "first_name",
end
NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "email", "first_name",