From 221b529789f4090341a825695aeb49b8df6dd11d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Apr 2020 09:09:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/requests/api/users_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'spec/requests/api/users_spec.rb') diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index ee0f7545adc..864f6f77f39 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -280,6 +280,18 @@ describe API::Users, :do_not_mock_admin_mode do expect(json_response.first['id']).to eq(user_with_2fa.id) end + it "returns users without projects" do + user_without_projects = create(:user) + create(:project, namespace: user.namespace) + create(:project, namespace: admin.namespace) + + get api('/users', admin), params: { without_projects: true } + + expect(response).to match_response_schema('public_api/v4/user/admins') + expect(json_response.size).to eq(1) + expect(json_response.first['id']).to eq(user_without_projects.id) + end + it 'returns 400 when provided incorrect sort params' do get api('/users', admin), params: { order_by: 'magic', sort: 'asc' } -- cgit v1.2.1