Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-07 23:35:39 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-12-07 23:35:39 +0300
commit7838317a14ddb686a16e914f9dbfb393a6bf5099 (patch)
treecdf70f6f056cff84ba9490c9399673ccdf3cb56f /spec/lib/gitlab
parentaf4d4e7067525e02eb2c17d2d0c524621c8ed345 (diff)
parentb7a5125f02865637ffbd4d7f8a623c994b861f0e (diff)
Merge branch 'fix_39233' into 'master'
fix #39233 - 500 in merge request Closes #39233 See merge request gitlab-org/gitlab-ce!15774
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r--spec/lib/gitlab/diff/inline_diff_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/lib/gitlab/diff/inline_diff_spec.rb b/spec/lib/gitlab/diff/inline_diff_spec.rb
index 15451c2cf99..0a41362f606 100644
--- a/spec/lib/gitlab/diff/inline_diff_spec.rb
+++ b/spec/lib/gitlab/diff/inline_diff_spec.rb
@@ -31,6 +31,10 @@ describe Gitlab::Diff::InlineDiff do
expect(subject[7]).to eq([17..17])
expect(subject[8]).to be_nil
end
+
+ it 'can handle unchanged empty lines' do
+ expect { described_class.for_lines(['- bar', '+ baz', '']) }.not_to raise_error
+ end
end
describe "#inline_diffs" do