diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-08 17:30:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-08 17:30:10 +0000 |
| commit | fe9a445faaaa5a90c9308b01877aadc1984a111b (patch) | |
| tree | 37314e0d8567219944c59a8d910b492cb7f840ea /spec/requests | |
| parent | 24663e80953ce48db600c17aa7baa91d8e38680c (diff) | |
| parent | b0d24ab1b52a78bf855a70886113b79707036029 (diff) | |
| download | gitlab-ce-fe9a445faaaa5a90c9308b01877aadc1984a111b.tar.gz | |
Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'
Expose User#last_sign_in_at and User#confirmed_at for admins
Closes #840
See merge request !3090
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/users_spec.rb | 2 |
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 |