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:
authorRubén Dávila <Ruben@GitLab.com>2015-12-16 02:09:09 +0300
committerRubén Dávila <rdavila84@gmail.com>2015-12-29 02:31:27 +0300
commit34657b821ae597de76ffd5a70d2b0b298dc270ed (patch)
treeb1aa6974c5631b0df71e5640329212216aeb10cf /spec/helpers/blob_helper_spec.rb
parent3a227b5abb0c794e95dd9153e3616c5d81aa06f8 (diff)
Add syntax highlighting to diff view. #3945
Diffstat (limited to 'spec/helpers/blob_helper_spec.rb')
-rw-r--r--spec/helpers/blob_helper_spec.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index b8bba36439a..74edef3a2b4 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -64,4 +64,15 @@ describe BlobHelper do
end
end
end
+
+ describe 'highlight_line' do
+ let(:expected) do
+ %q(<span id="LC1" class="line"><span class="nb">puts</span> <span class="s1">&#39;Hello&#39;</span> <span class="idiff">world</span></span>)
+ end
+
+ it 'should respect the inline diff markup' do
+ result = highlight_line('demo.rb', "puts 'Hello' <span class='idiff'>world</span>")
+ expect(result).to eq(expected)
+ end
+ end
end