Merge commit 'b99b6bb0960f749e1ba9a129be9c0365e306ed96' into 11-10-stable

1 files changed, 61 insertions, 0 deletions

diff --git a/spec/lib/gitlab/diff/suggestions_parser_spec.rb b/spec/lib/gitlab/diff/suggestions_parser_spec.rb
index 1119ea04995..1f2af42f6e7 100644
--- a/spec/lib/gitlab/diff/suggestions_parser_spec.rb
+++ b/spec/lib/gitlab/diff/suggestions_parser_spec.rb
@@ -69,5 +69,66 @@ describe Gitlab::Diff::SuggestionsParser do
                                                   lines_below: 0)
       end
     end
+
+    context 'multi-line suggestions' do
+      let(:markdown) do
+        <<-MARKDOWN.strip_heredoc
+          ```suggestion:-2+1
+            # above and below
+          ```
+
+          ```
+            nothing
+          ```
+
+          ```suggestion:-3
+            # only above
+          ```
+
+          ```suggestion:+3
+            # only below
+          ```
+
+          ```thing
+            this is not a suggestion, it's a thing
+          ```
+        MARKDOWN
+      end
+
+      it 'returns a list of Gitlab::Diff::Suggestion' do
+        expect(subject).to all(be_a(Gitlab::Diff::Suggestion))
+        expect(subject.size).to eq(3)
+      end
+
+      it 'suggestion with above and below param has correct data' do
+        from_line = position.new_line - 2
+        to_line = position.new_line + 1
+
+        expect(subject.first.to_hash).to include(from_content: blob_lines_data(from_line, to_line),
+                                                 to_content: "  # above and below\n",
+                                                 lines_above: 2,
+                                                 lines_below: 1)
+      end
+
+      it 'suggestion with above param has correct data' do
+        from_line = position.new_line - 3
+        to_line = position.new_line
+
+        expect(subject.second.to_hash).to eq(from_content: blob_lines_data(from_line, to_line),
+                                             to_content: "  # only above\n",
+                                             lines_above: 3,
+                                             lines_below: 0)
+      end
+
+      it 'suggestion with below param has correct data' do
+        from_line = position.new_line
+        to_line = position.new_line + 3
+
+        expect(subject.third.to_hash).to eq(from_content: blob_lines_data(from_line, to_line),
+                                            to_content: "  # only below\n",
+                                            lines_above: 0,
+                                            lines_below: 3)
+      end
+    end
   end
 end