public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rubygem-actionpack] rawhide: Apply upstream fix to make testsuite support libxml2 2.15
@ 2026-09-20 8:48 Mamoru TASAKA
0 siblings, 0 replies; only message in thread
From: Mamoru TASAKA @ 2026-09-20 8:48 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rubygem-actionpack
Branch : rawhide
Commit : d664e6870ba1b034cef7599e419acac64211b208
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date : 2026-09-20T17:48:10+09:00
Stats : +42/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/rubygem-actionpack/c/d664e6870ba1b034cef7599e419acac64211b208?branch=rawhide
Log:
Apply upstream fix to make testsuite support libxml2 2.15
---
diff --git a/rubygem-actionpack-pr58826-testsuite-support-libxml2-2_15.patch b/rubygem-actionpack-pr58826-testsuite-support-libxml2-2_15.patch
new file mode 100644
index 0000000..c0c896c
--- /dev/null
+++ b/rubygem-actionpack-pr58826-testsuite-support-libxml2-2_15.patch
@@ -0,0 +1,34 @@
+From a433eb639d0e3dedcd95428d12adbd9d75f3ac7b Mon Sep 17 00:00:00 2001
+From: Said Kaldybaev <said.kaldybaev@gmail.com>
+Date: Sat, 19 Sep 2026 13:31:56 -0700
+Subject: [PATCH] Avoid implied <p> tags in collection cache test
+
+libxml2 2.14.0 stopped implying <p> start tags in its HTML parser
+(GNOME/libxml2@8cf6129bbd836e666e7eda8c9e61c00387ae388b), so bare text
+inside <body> is no longer wrapped in a <p> element. The collection
+cache test asserted on that parser output rather than on the rendered
+order, so it fails when nokogiri is built against libxml2 2.14 or
+newer, such as on Fedora 46 which ships 2.15.4.
+
+Assert on the rendered order with a regexp instead. This passes with
+libxml2 2.13 and 2.15, and with rails-dom-testing 2.2 and 2.3, which
+differ in whether they collapse whitespace in text assertions.
+
+Fixes #58825
+---
+ actionpack/test/controller/caching_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
+index 1ee484a967a5a..fa214893a5f9d 100644
+--- a/actionpack/test/controller/caching_test.rb
++++ b/actionpack/test/controller/caching_test.rb
+@@ -428,7 +428,7 @@ def test_preserves_order_when_reading_from_cache_plus_rendering
+
+ get :index_ordered
+ assert_equal 3, @controller.partial_rendered_times
+- assert_select ":root", html: "<body><p>david, 1\n david, 2\n david, 3\n\n</p></body>"
++ assert_select ":root", /david, 1\s+david, 2\s+david, 3/
+ end
+
+ def test_explicit_render_call_with_options
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index d86729a..61d9f04 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -7,7 +7,7 @@
Name: rubygem-%{gem_name}
Epoch: 1
Version: 8.1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Web-flow and rendering framework putting the VC in MVC (part of Rails)
License: MIT
URL: https://rubyonrails.org
@@ -19,6 +19,9 @@ Source1: %{gem_name}-%{version}%{?prerelease}-tests.tar.gz
# https://github.com/rails/rails/pull/57283
# Support Minitest 6.0.6 assert_nil? implementation change
Patch0: rubygem-actionpack-pr57283-Minitest6_0_6-assert_nil.patch
+# https://github.com/rails/rails/pull/58826
+# Make testsuite support libxml2 2.15.4
+Patch1: rubygem-actionpack-pr58826-testsuite-support-libxml2-2_15.patch
# Let's keep Requires and BuildRequires sorted alphabeticaly
BuildRequires: ruby(release)
@@ -67,6 +70,7 @@ Documentation for %{name}.
(
cd %{_builddir}
%patch -P0 -p2
+%patch -P1 -p2
)
%build
@@ -130,6 +134,9 @@ find test -type f -name '*_test.rb' -print0 | \
%doc %{gem_instdir}/README.rdoc
%changelog
+* Sun Sep 20 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:8.1.3.1-2
+- Apply upstream fix to make testsuite support libxml2 2.15
+
* Mon Aug 03 2026 Vít Ondruch <vondruch@redhat.com> - 1:8.1.3.1-1
- Update to Action Pack 8.1.3.1.
Related: rhzb#2405582
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-20 8:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-20 8:48 [rpms/rubygem-actionpack] rawhide: Apply upstream fix to make testsuite support libxml2 2.15 Mamoru TASAKA
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox