summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorevuez <helloevuez@gmail.com>2016-02-24 13:14:37 +0100
committerRémy Coutable <remy@rymai.me>2016-03-04 11:59:43 +0100
commitb0d24ab1b52a78bf855a70886113b79707036029 (patch)
tree9361c8f927054ce3af525187d889aa731bcf71b2 /spec
parentf8c4dc97230c520df077c1274fd8d88680da5242 (diff)
downloadgitlab-ce-b0d24ab1b52a78bf855a70886113b79707036029.tar.gz
Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-api
Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/users_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index b82c5c7685f..96e8c8c51f8 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -47,6 +47,8 @@ describe API::API, api: true do
expect(json_response.first.keys).to include 'identities'
expect(json_response.first.keys).to include 'can_create_project'
expect(json_response.first.keys).to include 'two_factor_enabled'
+ expect(json_response.first.keys).to include 'last_sign_in_at'
+ expect(json_response.first.keys).to include 'confirmed_at'
end
end
end