Commit fa0cbb13 authored by Douwe Maan's avatar Douwe Maan

Fix specs and add a new one

parent 677b4db9
...@@ -104,8 +104,7 @@ describe DiffHelper do ...@@ -104,8 +104,7 @@ describe DiffHelper do
end end
end end
describe 'diff_line_content' do describe '#diff_line_content' do
it 'should return non breaking space when line is empty' do it 'should return non breaking space when line is empty' do
expect(diff_line_content(nil)).to eq('  ') expect(diff_line_content(nil)).to eq('  ')
end end
...@@ -116,9 +115,19 @@ describe DiffHelper do ...@@ -116,9 +115,19 @@ describe DiffHelper do
expect(diff_line_content(diff_file.diff_lines.first.type)).to eq('match') expect(diff_line_content(diff_file.diff_lines.first.type)).to eq('match')
expect(diff_file.diff_lines.first.new_pos).to eq(6) expect(diff_file.diff_lines.first.new_pos).to eq(6)
end end
end
describe "#mark_inline_diffs" do
let(:old_line) { %{abc 'def'} }
let(:new_line) { %{abc "def"} }
it "returns strings with marked inline diffs" do
marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line)
it 'should return safe HTML' do expect(marked_old_line).to eq("abc <span class='idiff left right'>&#39;def&#39;</span>")
expect(diff_line_content(diff_file.diff_lines.first.text)).to be_html_safe expect(marked_old_line).to be_html_safe
expect(marked_new_line).to eq("abc <span class='idiff left right'>&quot;def&quot;</span>")
expect(marked_new_line).to be_html_safe
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment