Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/lib/gitlab/discussions_diff/file_collection_spec.rb b/spec/lib/gitlab/discussions_diff/file_collection_spec.rb
index 6ef1e41450f..a13727b62ea 100644
--- a/spec/lib/gitlab/discussions_diff/file_collection_spec.rb
+++ b/spec/lib/gitlab/discussions_diff/file_collection_spec.rb
@@ -40,6 +40,14 @@ describe Gitlab::DiscussionsDiff::FileCollection do
       subject.load_highlight
     end
 
+    it 'does not write cache for empty mapping' do
+      allow(subject).to receive(:highlighted_lines_by_ids).and_return([])
+
+      expect(Gitlab::DiscussionsDiff::HighlightCache).not_to receive(:write_multiple)
+
+      subject.load_highlight
+    end
+
     it 'does not write cache for resolved notes' do
       diff_note_a.update_column(:resolved_at, Time.now)