Add latest changes from gitlab-org/gitlab@12-5-stable-ee

1 files changed, 6 insertions, 4 deletions

diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 3ab191c0032..e576a3d2d40 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -518,7 +518,7 @@ describe Projects::NotesController do
           project.id && Project.maximum(:id).succ
         end
 
-        it 'returns a 404' do
+        it 'returns a 404', :sidekiq_might_not_need_inline do
           create!
           expect(response).to have_gitlab_http_status(404)
         end
@@ -527,13 +527,13 @@ describe Projects::NotesController do
       context 'when the user has no access to the fork' do
         let(:fork_visibility) { Gitlab::VisibilityLevel::PRIVATE }
 
-        it 'returns a 404' do
+        it 'returns a 404', :sidekiq_might_not_need_inline do
           create!
           expect(response).to have_gitlab_http_status(404)
         end
       end
 
-      context 'when the user has access to the fork' do
+      context 'when the user has access to the fork', :sidekiq_might_not_need_inline do
         let!(:discussion) { forked_project.notes.find_discussion(existing_comment.discussion_id) }
         let(:fork_visibility) { Gitlab::VisibilityLevel::PUBLIC }
 
@@ -785,7 +785,9 @@ describe Projects::NotesController do
           end
 
           it "sends notifications if all discussions are resolved" do
-            expect_any_instance_of(MergeRequests::ResolvedDiscussionNotificationService).to receive(:execute).with(merge_request)
+            expect_next_instance_of(MergeRequests::ResolvedDiscussionNotificationService) do |instance|
+              expect(instance).to receive(:execute).with(merge_request)
+            end
 
             post :resolve, params: request_params
           end