projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20831: Return is_admin and is_invited so batch updates work
[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 16271c9e8f2db71758137850b479633e54136808..07e0b71d86098877da212a2d7eefc0087204d25e 100644
(file)
--- a/
services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/
services/api/test/functional/arvados/v1/users_controller_test.rb
@@
-1063,23
+1063,28
@@
The Arvados team.
'is_active' => true,
'is_admin' => true,
'prefs' => {'foo' => 'bar'},
'is_active' => true,
'is_admin' => true,
'prefs' => {'foo' => 'bar'},
+ 'is_invited' => true
},
newuuid => {
'first_name' => 'noot',
'email' => 'root@remot.example.com',
'username' => '',
},
newuuid => {
'first_name' => 'noot',
'email' => 'root@remot.example.com',
'username' => '',
+ 'is_invited' => true
},
unchanginguuid => {
'email' => 'root@unchanging.example.com',
'prefs' => {'foo' => {'bar' => 'baz'}},
},
unchanginguuid => {
'email' => 'root@unchanging.example.com',
'prefs' => {'foo' => {'bar' => 'baz'}},
+ 'is_invited' => true
},
conflictinguuid1 => {
'email' => 'root@conflictingname1.example.com',
},
conflictinguuid1 => {
'email' => 'root@conflictingname1.example.com',
- 'username' => 'active'
+ 'username' => 'active',
+ 'is_invited' => true
},
conflictinguuid2 => {
'email' => 'root@conflictingname2.example.com',
},
conflictinguuid2 => {
'email' => 'root@conflictingname2.example.com',
- 'username' => 'federatedactive'
+ 'username' => 'federatedactive',
+ 'is_invited' => true
},
}})
assert_response(:success)
},
}})
assert_response(:success)
@@
-1096,7
+1101,7
@@
The Arvados team.
assert_equal(1, Log.where(object_uuid: unchanginguuid).count)
end
assert_equal(1, Log.where(object_uuid: unchanginguuid).count)
end
- NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "email", "first_name",
+ NON_ADMIN_USER_DATA = ["uuid", "kind", "is_active", "
is_admin", "is_invited", "
email", "first_name",
"last_name", "username", "can_write", "can_manage"].sort
def check_non_admin_index
"last_name", "username", "can_write", "can_manage"].sort
def check_non_admin_index