commit f3f61fcc45aec8b46154b4400c16dffa8f9f172f
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Thu Jul 24 11:37:03 2014 +0200
Adjust test for URI-Find-20140709
MojoMojo-1.10-Provide-canonical-URL-for-test.patch | 45 ++++++++++++++++++++
mojomojo.spec | 9 ++++-
2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/MojoMojo-1.10-Provide-canonical-URL-for-test.patch b/MojoMojo-1.10-Provide-canonical-URL-for-test.patch
new file mode 100644
index 0000000..a3b11c5
--- /dev/null
+++ b/MojoMojo-1.10-Provide-canonical-URL-for-test.patch
@@ -0,0 +1,45 @@
+From 3cb8ddd23808ce1797738e14c877e5409b1af764 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
+Date: Thu, 24 Jul 2014 11:27:22 +0200
+Subject: [PATCH] Provide canonical URL for test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+URI-Find-20140709 stopped converting URIs into canonical form which
+broke t/formatter_file.t 'Text file is formated' test.
+
+This patch adjust the testing data to pass with recent URI-Find too.
+
+<https://github.com/mojomojo/mojomojo/issues/122>
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ t/formatter_file.t | 2 +-
+ t/var/files/test.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/formatter_file.t b/t/formatter_file.t
+index 15ad052..d703cc0 100755
+--- a/t/formatter_file.t
++++ b/t/formatter_file.t
+@@ -48,7 +48,7 @@ ok(! MojoMojo::Formatter::File->checkfile("$dir/test.txt", $c));
+ # Check good text file
+ $content = "<p>{{file Text $dir/test.txt}}</p>";
+ $ret = MojoMojo::Formatter::File->format_content(\$content, $c);
+-like($$ret, qr{<div class="formatter_txt">\n<p>Text file</p> <p><a href="http://mojomojo.org/";>http://mojomojo.org</a></p></div>}s, "Text file is formated");
++like($$ret, qr{<div class="formatter_txt">\n<p>Text file</p> <p><a href="http://mojomojo.org/";>http://mojomojo.org/</a></p></div>}s, "Text file is formated");
+
+ # check checkfile with file not include in whitelist
+ $ret = MojoMojo::Formatter::File->checkfile("/etc/passwd", $c);
+diff --git a/t/var/files/test.txt b/t/var/files/test.txt
+index 8ce01a7..d6b952c 100644
+--- a/t/var/files/test.txt
++++ b/t/var/files/test.txt
+@@ -1,2 +1,2 @@
+ Text file
+-http://mojomojo.org
++http://mojomojo.org/
+--
+1.9.3
+
diff --git a/mojomojo.spec b/mojomojo.spec
index 8a9ed35..cc6c414 100644
--- a/mojomojo.spec
+++ b/mojomojo.spec
@@ -1,6 +1,6 @@
Name: mojomojo
Version: 1.10
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A Wiki with a tree
License: GPL+ or Artistic
Group: Applications/Internet
@@ -20,6 +20,9 @@ Patch4: MojoMojo-1.10-normalize-name-as-a-byte-string.patch
# Fix usage of a deprecated regular expression,
# <https://github.com/mojomojo/mojomojo/pull/120>
Patch5: MojoMojo-1.10-Splitting-the-initial-is-deprecated-in-regex.patch
+# Adjust test for URI-Find-20140709, bug #1122853,
+# <https://github.com/mojomojo/mojomojo/issues/122>
+Patch6: MojoMojo-1.10-Provide-canonical-URL-for-test.patch
BuildArch: noarch
@@ -216,6 +219,7 @@ wiki page.
%patch3 -p 1
%patch4 -p 1
%patch5 -p 1
+%patch6 -p 1
# remove precomplied swfupload
rm -rf root/static/flash/
@@ -297,6 +301,9 @@ CATALYST_CONFIG=t/var/mojomojo.yml make test
%changelog
+* Thu Jul 24 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 1.10-5
+- Adjust test for URI-Find-20140709 (bug #1122853)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
