diff options
author | Brett Walker <bwalker@gitlab.com> | 2018-09-14 14:56:56 -0500 |
---|---|---|
committer | Brett Walker <bwalker@gitlab.com> | 2018-09-17 11:35:26 -0500 |
commit | 50a62b479e354efce5d85dd46bc25033cfd066f3 (patch) | |
tree | bd365e9666ab27ce5c975cc2b324ae675639ead3 /spec/models/user_spec.rb | |
parent | ccce7c7955ef193d238cf4aab457403cad4c06b6 (diff) | |
download | gitlab-ce-50a62b479e354efce5d85dd46bc25033cfd066f3.tar.gz |
Filter out archived projects from issue/mr count
Pass the 'non_archived' flag to finder methods
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 27aec49e348..99d17f563d9 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2543,6 +2543,34 @@ describe User do end end + describe '#assigned_open_merge_requests_count' do + it 'returns number of open merge requests from non-archived projects' do + user = create(:user) + project = create(:project, :public) + archived_project = create(:project, :public, :archived) + + create(:merge_request, source_project: project, author: user, assignee: user) + create(:merge_request, :closed, source_project: project, author: user, assignee: user) + create(:merge_request, source_project: archived_project, author: user, assignee: user) + + expect(user.assigned_open_merge_requests_count(force: true)).to eq 1 + end + end + + describe '#assigned_open_issues_count' do + it 'returns number of open issues from non-archived projects' do + user = create(:user) + project = create(:project, :public) + archived_project = create(:project, :public, :archived) + + create(:issue, project: project, author: user, assignees: [user]) + create(:issue, :closed, project: project, author: user, assignees: [user]) + create(:issue, project: archived_project, author: user, assignees: [user]) + + expect(user.assigned_open_issues_count(force: true)).to eq 1 + end + end + describe '#personal_projects_count' do it 'returns the number of personal projects using a single query' do user = build(:user) |