Merge branch 'fix-notification-recipient-service-spec-for-ee' into 'master'

Fix NotificationRecipientService spec for EE

See merge request gitlab-org/gitlab-ce!19580
This commit is contained in:
Douwe Maan 2018-06-08 11:17:17 +00:00
commit d0a040d315

View file

@ -19,8 +19,8 @@ describe NotificationRecipientService do
end end
end end
it 'avoids N+1 queries' do it 'avoids N+1 queries', :request_store do
create_watcher Gitlab::GitalyClient.allow_n_plus_1_calls { create_watcher }
service.build_new_note_recipients(note) service.build_new_note_recipients(note)
@ -28,7 +28,7 @@ describe NotificationRecipientService do
service.build_new_note_recipients(note) service.build_new_note_recipients(note)
end end
create_watcher Gitlab::GitalyClient.allow_n_plus_1_calls { create_watcher }
expect { service.build_new_note_recipients(note) }.not_to exceed_query_limit(control_count) expect { service.build_new_note_recipients(note) }.not_to exceed_query_limit(control_count)
end end