Commit 02650d97 authored by Douwe Maan's avatar Douwe Maan

Fix specs

parent 9ce9e0d3
...@@ -122,9 +122,9 @@ describe DiffHelper do ...@@ -122,9 +122,9 @@ describe DiffHelper do
it "returns strings with marked inline diffs" do it "returns strings with marked inline diffs" do
marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line) marked_old_line, marked_new_line = mark_inline_diffs(old_line, new_line)
expect(marked_old_line).to eq("abc <span class='idiff left right deletion'>&#39;def&#39;</span>") expect(marked_old_line).to eq(%q{abc <span class="idiff left right deletion">&#39;def&#39;</span>})
expect(marked_old_line).to be_html_safe expect(marked_old_line).to be_html_safe
expect(marked_new_line).to eq("abc <span class='idiff left right addition'>&quot;def&quot;</span>") expect(marked_new_line).to eq(%q{abc <span class="idiff left right addition">&quot;def&quot;</span>})
expect(marked_new_line).to be_html_safe expect(marked_new_line).to be_html_safe
end end
end end
......
...@@ -34,7 +34,7 @@ describe Gitlab::Diff::Highlight, lib: true do ...@@ -34,7 +34,7 @@ describe Gitlab::Diff::Highlight, lib: true do
end end
it 'highlights and marks added lines' do it 'highlights and marks added lines' do
code = %Q{+<span id="LC9" class="line" lang="ruby"> <span class="k">raise</span> <span class="no"><span class='idiff left'>RuntimeError</span></span><span class="p"><span class='idiff'>,</span></span><span class='idiff right'> </span><span class="s2">"System commands must be given as an array of strings"</span></span>\n} code = %Q{+<span id="LC9" class="line" lang="ruby"> <span class="k">raise</span> <span class="no"><span class="idiff left">RuntimeError</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff right"> </span><span class="s2">"System commands must be given as an array of strings"</span></span>\n}
expect(subject[5].text).to eq(code) expect(subject[5].text).to eq(code)
end end
...@@ -67,7 +67,7 @@ describe Gitlab::Diff::Highlight, lib: true do ...@@ -67,7 +67,7 @@ describe Gitlab::Diff::Highlight, lib: true do
end end
it 'marks added lines' do it 'marks added lines' do
code = %q{+ raise <span class='idiff left right'>RuntimeError, </span>&quot;System commands must be given as an array of strings&quot;} code = %q{+ raise <span class="idiff left right">RuntimeError, </span>&quot;System commands must be given as an array of strings&quot;}
expect(subject[5].text).to eq(code) expect(subject[5].text).to eq(code)
expect(subject[5].text).to be_html_safe expect(subject[5].text).to be_html_safe
......
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