diff options
author | Robert Speicher <robert@gitlab.com> | 2018-10-04 16:11:42 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-10-04 16:11:42 +0000 |
commit | 707148ebae4cdda42b2b0cc5f87a6aa49615728f (patch) | |
tree | 0fc2c23d019eb7f9a7fffc10291781e80f02a528 /spec | |
parent | fc4112077e9fa71a4c6094f761df824a205f2396 (diff) | |
parent | 0199c92cc9fd7722f2ec5796936dd35341df4ef5 (diff) | |
download | gitlab-ce-707148ebae4cdda42b2b0cc5f87a6aa49615728f.tar.gz |
Merge branch '47496-more-n-1s-in-calculating-notification-recipients' into 'master'
Resolve "More N+1s in calculating notification recipients"
Closes #47496
See merge request gitlab-org/gitlab-ce!22050
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/notification_recipient_service_spec.rb | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/spec/services/notification_recipient_service_spec.rb b/spec/services/notification_recipient_service_spec.rb index 14ba6b7bed2..cea5ea125b9 100644 --- a/spec/services/notification_recipient_service_spec.rb +++ b/spec/services/notification_recipient_service_spec.rb @@ -10,27 +10,50 @@ describe NotificationRecipientService do let(:issue) { create(:issue, project: project, assignees: [assignee]) } let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id) } - def create_watcher - watcher = create(:user) - create(:notification_setting, source: project, user: watcher, level: :watch) + shared_examples 'no N+1 queries' do + it 'avoids N+1 queries', :request_store do + create_user - other_projects.each do |other_project| - create(:notification_setting, source: other_project, user: watcher, level: :watch) + service.build_new_note_recipients(note) + + control_count = ActiveRecord::QueryRecorder.new do + service.build_new_note_recipients(note) + end + + create_user + + expect { service.build_new_note_recipients(note) }.not_to exceed_query_limit(control_count) end end - it 'avoids N+1 queries', :request_store do - create_watcher + context 'when there are multiple watchers' do + def create_user + watcher = create(:user) + create(:notification_setting, source: project, user: watcher, level: :watch) + + other_projects.each do |other_project| + create(:notification_setting, source: other_project, user: watcher, level: :watch) + end + end - service.build_new_note_recipients(note) + include_examples 'no N+1 queries' + end - control_count = ActiveRecord::QueryRecorder.new do - service.build_new_note_recipients(note) + context 'when there are multiple subscribers' do + def create_user + subscriber = create(:user) + issue.subscriptions.create(user: subscriber, project: project, subscribed: true) end - create_watcher + include_examples 'no N+1 queries' - expect { service.build_new_note_recipients(note) }.not_to exceed_query_limit(control_count) + context 'when the project is private' do + before do + project.update!(visibility_level: Gitlab::VisibilityLevel::PRIVATE) + end + + include_examples 'no N+1 queries' + end end end end |