Commit 4186e343 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'pl-spec-request-api-users-order-fix' into 'master'

Fix broken master for API users specs

Closes #219396

See merge request gitlab-org/gitlab!33306
parents 4f3da9a5 869c6cb4
...@@ -468,13 +468,14 @@ describe API::Users, :do_not_mock_admin_mode do ...@@ -468,13 +468,14 @@ describe API::Users, :do_not_mock_admin_mode do
context "when authenticated and ldap is enabled" do context "when authenticated and ldap is enabled" do
it "returns non-ldap user" do it "returns non-ldap user" do
create :omniauth_user, provider: "ldapserver1" ldap_user = create :omniauth_user, provider: "ldapserver1"
get api("/users", user), params: { skip_ldap: "true" } get api("/users", user), params: { skip_ldap: "true" }
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
expect(json_response).to be_an Array expect(json_response).to be_an Array
expect(json_response.first["username"]).to eq user.username expect(json_response.map { |u| u['username'] })
.not_to include(ldap_user.username)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment