diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-13 08:29:49 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-07-13 08:29:49 +0300 |
commit | 5fea640e90fb8d5d50a777580d273f6d0f5fbb59 (patch) | |
tree | 7eaac0d580b3cd4d46e2c514f9a18d38e13d1883 /spec | |
parent | 67668d9de67839dad746ad16ca46721bfa89ddc3 (diff) | |
parent | 489e1937043d6f58af28d11831ba6da94e90a705 (diff) |
Merge branch 'multi-line-inline-diff' into 'master'
Render inline diffs for multiple changed lines following eachother
Before:
![Screen_Shot_2016-07-11_at_00.08.27](/uploads/b14664211e0f5cef6e77a78eadfcbcdf/Screen_Shot_2016-07-11_at_00.08.27.png)
After:
![Screen_Shot_2016-07-11_at_00.07.34](/uploads/567be631869a4867a2edf6ff7eda6369/Screen_Shot_2016-07-11_at_00.07.34.png)
See merge request !5174
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/diff/inline_diff_spec.rb | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/spec/lib/gitlab/diff/inline_diff_spec.rb b/spec/lib/gitlab/diff/inline_diff_spec.rb index 95a993d26cf..8ca3f73509e 100644 --- a/spec/lib/gitlab/diff/inline_diff_spec.rb +++ b/spec/lib/gitlab/diff/inline_diff_spec.rb @@ -3,14 +3,19 @@ require 'spec_helper' describe Gitlab::Diff::InlineDiff, lib: true do describe '.for_lines' do let(:diff) do - <<eos - class Test -- def initialize(test = true) -+ def initialize(test = false) - @test = test - end - end -eos + <<-EOF.strip_heredoc + class Test + - def initialize(test = true) + + def initialize(test = false) + @test = test + - if true + - @foo = "bar" + + unless false + + @foo = "baz" + end + end + end + EOF end let(:subject) { described_class.for_lines(diff.lines) } @@ -20,8 +25,11 @@ eos expect(subject[1]).to eq([25..27]) expect(subject[2]).to eq([25..28]) expect(subject[3]).to be_nil - expect(subject[4]).to be_nil - expect(subject[5]).to be_nil + expect(subject[4]).to eq([5..10]) + expect(subject[5]).to eq([17..17]) + expect(subject[6]).to eq([5..15]) + expect(subject[7]).to eq([17..17]) + expect(subject[8]).to be_nil end end |