summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-03-15 19:51:27 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-03-15 19:51:27 -0500
commit7e03b40221388bd0567be6609f2ededa7f934179 (patch)
tree2158edc267c768e6d109522a07f60978b3930167
parent64d0dd1807c75be21a8f5bfe3a74b9230b5b8979 (diff)
downloadgitlab-ce-7e03b40221388bd0567be6609f2ededa7f934179.tar.gz
Return an empty Array when there aren't lines to parse.
-rw-r--r--lib/gitlab/diff/parser.rb2
-rw-r--r--spec/lib/gitlab/diff/parser_spec.rb5
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb
index d0f6ba23ab4..d0815fc7eea 100644
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
@@ -4,6 +4,8 @@ module Gitlab
include Enumerable
def parse(lines)
+ return [] if lines.blank?
+
@lines = lines
line_obj_index = 0
line_old = 1
diff --git a/spec/lib/gitlab/diff/parser_spec.rb b/spec/lib/gitlab/diff/parser_spec.rb
index f576c39284e..cdff063a9ed 100644
--- a/spec/lib/gitlab/diff/parser_spec.rb
+++ b/spec/lib/gitlab/diff/parser_spec.rb
@@ -90,4 +90,9 @@ eos
end
end
end
+
+ context 'when lines is empty' do
+ it { expect(parser.parse([])).to eq([]) }
+ it { expect(parser.parse(nil)).to eq([]) }
+ end
end