diff options
author | Imre Farkas <ifarkas@gitlab.com> | 2019-05-28 10:14:26 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-05-28 10:14:26 +0000 |
commit | 3895e547415cf502ff6eafc18e98f245a058afcd (patch) | |
tree | 06ddf4ea7d3bda4505b7445be19c5b94abf7ec61 /spec/requests/api/users_spec.rb | |
parent | 9c2d0d87581f34567e33de1b384f1f360edcd4b7 (diff) | |
download | gitlab-ce-3895e547415cf502ff6eafc18e98f245a058afcd.tar.gz |
CE port of Move EE specific lines in API::Users
Diffstat (limited to 'spec/requests/api/users_spec.rb')
-rw-r--r-- | spec/requests/api/users_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index b84202364e1..bab1520b960 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -276,6 +276,18 @@ describe API::Users do expect(response).to have_gitlab_http_status(400) end end + + context "when authenticated and ldap is enabled" do + it "returns non-ldap user" do + create :omniauth_user, provider: "ldapserver1" + + get api("/users", user), params: { skip_ldap: "true" } + + expect(response).to have_gitlab_http_status(200) + expect(json_response).to be_an Array + expect(json_response.first["username"]).to eq user.username + end + end end describe "GET /users/:id" do |