summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-06-16 10:46:27 +0000
committerGo MAEDA <maeda@farend.jp>2019-06-16 10:46:27 +0000
commitdd55d8f7e71620c1c8e85f765ac124d71acaed20 (patch)
tree455c06cecc85135a3e2bab25d36a1f210d18f123
parent9cdd8bf039c78017ff80283ef76c2f45783ec987 (diff)
downloadredmine-dd55d8f7e71620c1c8e85f765ac124d71acaed20.tar.gz
redmine-dd55d8f7e71620c1c8e85f765ac124d71acaed20.zip
Update Rouge to 3.4.1 (#31556).
Patch by Marius BALTEANU and Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@18258 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
-rw-r--r--test/helpers/application_helper_test.rb2
-rw-r--r--test/unit/lib/redmine/syntax_highlighting/rouge_test.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 8bfa48b2d..8b3c43cfb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
gem "rails", "5.2.3"
-gem "rouge", "~> 3.3.0"
+gem "rouge", "~> 3.4.1"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"
gem "actionpack-xml_parser"
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index e5feebdd9..f46720120 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -1165,7 +1165,7 @@ document.write("Hello World!");
RAW
expected = <<-EXPECTED
-<pre><code class=\"ECMA_script syntaxhl\"><span class=\"cm\">/* Hello */</span><span class=\"nb\">document</span><span class=\"p\">.</span><span class=\"nx\">write</span><span class=\"p\">(</span><span class=\"s2\">\"Hello World!\"</span><span class=\"p\">);</span></code></pre>
+<pre><code class="ECMA_script syntaxhl"><span class="cm">/* Hello */</span><span class="nb">document</span><span class="p">.</span><span class="nx">write</span><span class="p">(</span><span class="dl">"</span><span class="s2">Hello World!</span><span class="dl">"</span><span class="p">);</span></code></pre>
EXPECTED
assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
diff --git a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
index 5318cb85b..16387966c 100644
--- a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
+++ b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
@@ -39,7 +39,7 @@ print "Hello, world!\n";
RAW_PERL
expected_perl = <<'EXPECTED_PERL'
<span class="c1">#!/usr/bin/perl</span>
-<span class="k">print</span> <span class="s">"Hello, world!\n"</span><span class="p">;</span>
+<span class="k">print</span> <span class="p">"</span><span class="s2">Hello, world!</span><span class="se">\n</span><span class="p">";</span>
EXPECTED_PERL
raw_prolog = <<'RAW_PROLOG'
#!/usr/bin/swipl