From: Manuel Rüger Date: Sun, 22 Jan 2017 00:46:32 +0000 (+0100) Subject: dev-ruby/wikicloth: Apply patch to fix tests (partially) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=afc0fa15411677a5f8e98dfa7cbf78735626c014;p=gentoo.git dev-ruby/wikicloth: Apply patch to fix tests (partially) Package-Manager: portage-2.3.3 --- diff --git a/dev-ruby/wikicloth/files/wikicloth-0.8.3-fix-tests.patch b/dev-ruby/wikicloth/files/wikicloth-0.8.3-fix-tests.patch new file mode 100644 index 000000000000..b50752a9ae9b --- /dev/null +++ b/dev-ruby/wikicloth/files/wikicloth-0.8.3-fix-tests.patch @@ -0,0 +1,68 @@ +From 5c84028cadb36e7e2a220c7ab05398722c6d0e84 Mon Sep 17 00:00:00 2001 +From: Per Andersson +Date: Sat, 10 Oct 2015 22:33:58 +0200 +Subject: [PATCH 1/2] Update output assert in autolinking pre statement + +The 
 tag doesn't keep html entities.
+---
+ test/wiki_cloth_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/wiki_cloth_test.rb b/test/wiki_cloth_test.rb
+index 2f0481a..483cecf 100644
+--- a/test/wiki_cloth_test.rb
++++ b/test/wiki_cloth_test.rb
+@@ -58,7 +58,7 @@ class WikiClothTest < Test::Unit::TestCase
+   test "autolinking keeps html entities intact" do
+     wiki = WikiCloth::Parser.new(:data => "
& >
& <
 https://github.com/repo/README.md > &")
+     data = wiki.to_html
+-    assert_equal "\n
& >
& <
 https://github.com/repo/README.md > &
", data
++    assert_equal "\n
& >
&amp; &lt;
 https://github.com/repo/README.md > &
", data
+   end
+ 
+   test "image url override" do
+
+From a7eccc2970b0f1b1973881fe139b1f2cb51af2eb Mon Sep 17 00:00:00 2001
+From: Per Andersson 
+Date: Sat, 10 Oct 2015 22:40:25 +0200
+Subject: [PATCH 2/2] Update output for table of content tests
+
+Newlines seems to have been removed from HTML output for TOC.
+
+* empty item in toc
+* toc declared as list
+* toc numbered
+---
+ test/wiki_cloth_test.rb | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/test/wiki_cloth_test.rb b/test/wiki_cloth_test.rb
+index 483cecf..198295c 100644
+--- a/test/wiki_cloth_test.rb
++++ b/test/wiki_cloth_test.rb
+@@ -446,7 +446,7 @@ class WikiClothTest < Test::Unit::TestCase
+   test "empty item in toc" do
+     wiki = WikiCloth::WikiCloth.new({:data => "__TOC__\n=A="})
+     data = wiki.render
+-    assert data.include?("
\n
Table of Contents
\n\n
")
++    assert data.include?('
Table of Contents
')
+   end
+ 
+   test "pre at beginning" do
+@@ -458,12 +458,14 @@ class WikiClothTest < Test::Unit::TestCase
+   test "toc declared as list" do
+     wiki = WikiCloth::WikiCloth.new({:data => "__TOC__\n=A=\n==B==\n===C==="})
+     data = wiki.render
+-    assert data.include?("
\n
Table of Contents
\n\n
")
++    puts data
++    assert data.include?('
Table of Contents
')
+   end
+ 
+   test "toc numbered" do
+     wiki = WikiCloth::WikiCloth.new({:data => "=A=\n=B=\n==C==\n==D==\n===E===\n===F===\n====G====\n====H====\n==I==\n=J=\n=K=\n===L===\n===M===\n====N====\n====O===="})
+     data = wiki.render(:noedit => true, :toc_numbered => true)
+-    assert data.include?("
\n
Table of Contents
\n\n
")
++    assert data.include?('
Table of Contents
')
++
+   end
+ end
diff --git a/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild b/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild
index c60f14b42314..faf183d1d283 100644
--- a/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild
+++ b/dev-ruby/wikicloth/wikicloth-0.8.3.ebuild
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
+
 ruby_add_rdepend "dev-ruby/builder:*
 	dev-ruby/expression_parser
 	dev-ruby/htmlentities