[DRE-maint] Bug#1080343: ruby-html2haml: fix FTBFS with Minitest 5.25+

[Zixing Liu]

Package: ruby-html2haml
Version: 2.3.0-2
Severity: normal
Tags: patch ftbfs
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/minitest.patch: Fix the patch so that it works with minitest 5.25+


Thanks for considering the patch.


-- System Information:
Debian Release: trixie/sid
  APT prefers noble-updates
  APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'), (100, 'noble-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.8.0-41-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru ruby-html2haml-2.3.0/debian/patches/minitest.patch ruby-html2haml-2.3.0/debian/patches/minitest.patch
--- ruby-html2haml-2.3.0/debian/patches/minitest.patch	2024-08-28 16:52:02.000000000 -0600
+++ ruby-html2haml-2.3.0/debian/patches/minitest.patch	2024-09-02 08:10:02.000000000 -0600
@@ -3,31 +3,37 @@
 Author: C?dric Boutillier <boutil at debian.org>
 Last-Update: 2024-08-29
 
---- a/test/erb_test.rb
-+++ b/test/erb_test.rb
+Index: ruby-html2haml/test/erb_test.rb
+===================================================================
+--- ruby-html2haml.orig/test/erb_test.rb
++++ ruby-html2haml/test/erb_test.rb
 @@ -1,7 +1,7 @@
  $: << './test'
  require 'test_helper'
  
 -class ErbTest < MiniTest::Unit::TestCase
-+class ErbTest < Minitest::Unit::TestCase
++class ErbTest < Minitest::Test
    def test_erb
      assert_equal '- foo = bar', render_erb('<% foo = bar %>')
      assert_equal '- foo = bar', render_erb('<% foo = bar -%>')
---- a/test/html2haml_test.rb
-+++ b/test/html2haml_test.rb
+Index: ruby-html2haml/test/html2haml_test.rb
+===================================================================
+--- ruby-html2haml.orig/test/html2haml_test.rb
++++ ruby-html2haml/test/html2haml_test.rb
 @@ -2,7 +2,7 @@
  $: << './test'
  require 'test_helper'
  
 -class Html2HamlTest < MiniTest::Unit::TestCase
-+class Html2HamlTest < Minitest::Unit::TestCase
++class Html2HamlTest < Minitest::Test
    def test_empty_render_should_remain_empty
      assert_equal '', render('')
    end
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -6,11 +6,12 @@
+Index: ruby-html2haml/test/test_helper.rb
+===================================================================
+--- ruby-html2haml.orig/test/test_helper.rb
++++ ruby-html2haml/test/test_helper.rb
+@@ -6,11 +6,12 @@ end
  
  # require "bundler/setup"
  require "minitest/autorun"
@@ -37,7 +43,7 @@
  require 'html2haml/html/erb'
  
 -class MiniTest::Unit::TestCase
-+class Minitest::Unit::TestCase
++class Minitest::Test
    protected
    def render(text, options = {})
      Html2haml::HTML.new(text, options).render.rstrip