diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 15:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 15:09:22 +0300 |
| commit | 9d67bc14cb59a27c9877474e77d155173a1dedff (patch) | |
| tree | fae9da04bb838c0bf93df6ba7669c15413e99f8e /spec/services/draft_notes | |
| parent | 9c7b3812a22465b77ee24657ad1b446b81ffbc74 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/draft_notes')
| -rw-r--r-- | spec/services/draft_notes/publish_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/services/draft_notes/publish_service_spec.rb b/spec/services/draft_notes/publish_service_spec.rb index 0dd399012ce..ae0c8113904 100644 --- a/spec/services/draft_notes/publish_service_spec.rb +++ b/spec/services/draft_notes/publish_service_spec.rb @@ -237,7 +237,8 @@ RSpec.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 |