Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/models/concerns/discussion_on_diff_spec.rb b/spec/models/concerns/discussion_on_diff_spec.rb
index baddca47dfa..f091861bd41 100644
--- a/spec/models/concerns/discussion_on_diff_spec.rb
+++ b/spec/models/concerns/discussion_on_diff_spec.rb
@@ -59,6 +59,18 @@ describe DiscussionOnDiff do
       end
     end
 
+    context "when the diff line does not exist on a corrupt diff note" do
+      subject { create(:diff_note_on_merge_request, line_number: 18).to_discussion }
+
+      before do
+        allow(subject).to receive(:diff_line) { nil }
+      end
+
+      it "returns an empty array" do
+        expect(truncated_lines).to eq([])
+      end
+    end
+
     context 'when the discussion is on an image' do
       subject { create(:image_diff_note_on_merge_request).to_discussion }