dep: update libxml2 to v2.9.14

from v2.9.13 https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.9.14
sparklemotion · May 4, 2022 · 66c2886 · 66c2886
1 parent b7c4cc3
commit 66c2886
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 58 deletions.
diff --git a/dependencies.yml b/dependencies.yml
@@ -1,7 +1,7 @@
 libxml2:
-  version: "2.9.13"
-  sha256: "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.13.sha256sum
+  version: "2.9.14"
+  sha256: "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.sha256sum
 
 libxslt:
   version: "1.1.35"

diff --git a/patches/libxml2/0010-Revert-Different-approach-to-fix-quadratic-behavior.patch b/patches/libxml2/0010-Revert-Different-approach-to-fix-quadratic-behavior.patch
diff --git a/test/html4/test_comments.rb b/test/html4/test_comments.rb
@@ -173,7 +173,7 @@ class TestComment < Nokogiri::TestCase
         let(:body) { doc.at_css("body") }
         let(:subject) { doc.at_css("div#under-test") }
 
-        if Nokogiri.uses_libxml?
+        if Nokogiri.uses_libxml?("<=2.9.13")
           it "ignores up to the next '>'" do # NON-COMPLIANT
             assert_equal 2, body.children.length
             assert_equal body.children[0], subject
@@ -183,10 +183,33 @@ class TestComment < Nokogiri::TestCase
             assert_predicate body.children[1], :text?
             assert_equal "-->hello", body.children[1].content
           end
+        elsif Nokogiri.uses_libxml?
+          it "parses as pcdata" do # NON-COMPLIANT
+            assert_equal 1, body.children.length
+            assert_equal subject, body.children.first
+
+            assert_equal 3, subject.children.length
+            subject.children[0].tap do |child|
+              assert_predicate(child, :text?)
+              assert_equal("<! comment ", child.content)
+            end
+            subject.children[1].tap do |child|
+              assert_predicate(child, :element?)
+              assert_equal("div", child.name)
+              assert_equal("inner content", child.content)
+            end
+            subject.children[2].tap do |child|
+              assert_predicate(child, :text?)
+              assert_equal("-->hello", child.content)
+            end
+          end
         end
 
         if Nokogiri.jruby?
           it "ignores up to the next '-->'" do # NON-COMPLIANT
+            assert_equal 1, body.children.length
+            assert_equal subject, body.children.first
+
             assert_equal 1, subject.children.length
             assert_predicate subject.children[0], :text?
             assert_equal "hello", subject.children[0].content

diff --git a/test/html4/test_document.rb b/test/html4/test_document.rb
@@ -801,18 +801,25 @@ def test_leaking_dtd_nodes_after_internal_subset_removal
 
             it "skips to the next start tag" do
               # see https://github.com/sparklemotion/nokogiri/issues/2461 for why we're testing this edge case
-              if Nokogiri.uses_libxml?(">= 2.9.13")
-                skip_unless_libxml2_patch("0010-Revert-Different-approach-to-fix-quadratic-behavior.patch")
-              end
-
               doc = Nokogiri::HTML4.parse(input)
               body = doc.at_xpath("//body")
 
-              expected_error_snippet = Nokogiri.uses_libxml? ? "invalid element name" : "Missing start element name"
-              assert_includes(doc.errors.first.to_s, expected_error_snippet)
-
-              assert_equal("this < that", body.children.first.text, body.to_html)
-              assert_equal(["div", "div"], body.children.map(&:name), body.to_html)
+              if Nokogiri.uses_libxml?("= 2.9.13")
+                # <body><div>this <div>second element</div></div></body>
+                assert_equal(1, body.children.length)
+                body.children.first.tap do |div|
+                  assert_equal(2, div.children.length)
+                  assert_equal("this ", div.children[0].content)
+                  assert_equal("div", div.children[1].name)
+                  assert_equal("second element", div.children[1].content)
+                end
+              else
+                # <body><div>this &lt; that</div><div>second element</div></body>
+                assert_equal(2, body.children.length)
+                assert_equal(["div", "div"], body.children.map(&:name), body.to_html)
+                assert_equal("this < that", body.children[0].text, body.to_html)
+                assert_equal("second element", body.children[1].text, body.to_html)
+              end
             end
           end