Add latest changes from gitlab-org/gitlab@13-2-stable-ee

3 files changed, 5 insertions, 4 deletions

diff --git a/spec/services/draft_notes/create_service_spec.rb b/spec/services/draft_notes/create_service_spec.rb
index 8f244ed386b..f0291067777 100644
--- a/spec/services/draft_notes/create_service_spec.rb
+++ b/spec/services/draft_notes/create_service_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe DraftNotes::CreateService do
+RSpec.describe DraftNotes::CreateService do
   let(:merge_request) { create(:merge_request) }
   let(:project) { merge_request.target_project }
   let(:user) { merge_request.author }
diff --git a/spec/services/draft_notes/destroy_service_spec.rb b/spec/services/draft_notes/destroy_service_spec.rb
index d0bf88dcdbe..f725f08f3c7 100644
--- a/spec/services/draft_notes/destroy_service_spec.rb
+++ b/spec/services/draft_notes/destroy_service_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe DraftNotes::DestroyService do
+RSpec.describe DraftNotes::DestroyService do
   let(:merge_request) { create(:merge_request) }
   let(:project) { merge_request.target_project }
   let(:user) { merge_request.author }
diff --git a/spec/services/draft_notes/publish_service_spec.rb b/spec/services/draft_notes/publish_service_spec.rb
index 4ebae2f9aa2..ae0c8113904 100644
--- a/spec/services/draft_notes/publish_service_spec.rb
+++ b/spec/services/draft_notes/publish_service_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe DraftNotes::PublishService do
+RSpec.describe DraftNotes::PublishService do
   include RepoHelpers
 
   let(:merge_request) { create(:merge_request) }
@@ -237,7 +237,8 @@ describe DraftNotes::PublishService do
     it 'resolves the thread' do
       publish(draft: draft_note)
 
-      expect(note.discussion.resolved?).to be true
+      # discussion is memoized and reload doesn't clear the memoization
+      expect(Note.find(note.id).discussion.resolved?).to be true
     end
 
     it 'sends notifications if all threads are resolved' do