diff options
author | Rémy Coutable <remy@rymai.me> | 2016-11-16 16:58:32 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-11-16 16:58:32 +0000 |
commit | 2e1fe59e373e4be404b19f4de3c8f44bb07fe91f (patch) | |
tree | effb75ede777da8702f1a0b27aa7018f11b1c1dd /spec/models/user_spec.rb | |
parent | b5d3c3caa83d5777146023f40f5e2ebea65c1d3f (diff) | |
parent | 00d9d7678b9df3a25c4f4e8f210c9d17a798c9cd (diff) | |
download | gitlab-ce-2e1fe59e373e4be404b19f4de3c8f44bb07fe91f.tar.gz |
Merge branch 'patch-5' into 'master'
Fix issue where "Without projects" filter admin area shows 0 users incorrectly. Before this fix, if any outstanding group or project invitations exist the count show as 0.
Fixes #3367
See merge request !6611
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 54b23b02003..3159243553b 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -490,6 +490,28 @@ describe User, models: true do end end + describe '.without_projects' do + let!(:project) { create(:empty_project, :public) } + let!(:user) { create(:user) } + let!(:user_without_project) { create(:user) } + let!(:user_without_project2) { create(:user) } + + before do + # add user to project + project.team << [user, :master] + + # create invite to projet + create(:project_member, :developer, project: project, invite_token: '1234', invite_email: 'inviteduser1@example.com') + + # create request to join project + project.request_access(user_without_project2) + end + + it { expect(User.without_projects).not_to include user } + it { expect(User.without_projects).to include user_without_project } + it { expect(User.without_projects).to include user_without_project2 } + end + describe '.not_in_project' do before do User.delete_all |