diff --git a/0002-Change-MiniTest-to-Minitest.patch b/0002-Change-MiniTest-to-Minitest.patch new file mode 100644 index 0000000000000000000000000000000000000000..2129f1bdce1fd84f11b55adeff7e00982ee8f157 --- /dev/null +++ b/0002-Change-MiniTest-to-Minitest.patch @@ -0,0 +1,22 @@ +From 9e25b325944514c35e0614f595ed91f3b3006680 Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Thu, 10 Aug 2023 20:54:20 +0100 +Subject: [PATCH] Update MiniTest to Minitest + +--- + spec/rspec/expectations/minitest_integration_spec.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spec/rspec/expectations/minitest_integration_spec.rb b/spec/rspec/expectations/minitest_integration_spec.rb +index 2563f07a7..e0537b8c8 100644 +--- a/spec/rspec/expectations/minitest_integration_spec.rb ++++ b/spec/rspec/expectations/minitest_integration_spec.rb +@@ -12,7 +12,7 @@ module RSpec + + it "includes itself in Minitest::Test, and sets up our exceptions to be counted as assertion failures" do + with_minitest_loaded do +- minitest_case = MiniTest::Test.allocate ++ minitest_case = ::Minitest::Test.allocate + expect(minitest_case).to respond_to(*sample_matchers) + + expect(RSpec::Expectations::ExpectationNotMetError).to be ::Minitest::Assertion diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index e0e11cbd673c06a0fcd42d3642b821a9efed0892..b6cd39306829eac62cca9c81e6141395af97ef66 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -7,12 +7,14 @@ Summary: RSpec expectations (should and matchers) Name: rubygem-%{gem_name} Version: %{majorver} -Release: 2 +Release: 3 License: MIT URL: http://github.com/rspec/rspec-expectations Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem Source1: https://github.com/rspec/%{gem_name}/archive/v%{majorver}.tar.gz Patch1: 0001-fix-NameError-compare-failure.patch +# https://github.com/rspec/rspec-expectations/pull/1427/commits/9e25b325944514c35e0614f595ed91f3b3006680 +Patch2: 0002-Change-MiniTest-to-Minitest.patch BuildRequires: rubygems-devel %if 0%{?need_bootstrap_set} < 1 BuildRequires: rubygem(rspec) rubygem(minitest) >= 5 git @@ -32,7 +34,8 @@ This package contains documentation for %{name}. %setup -q -T -n %{gem_name}-%{version} -b 1 ln -s %{gem_name}-%{majorver}/spec spec gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch1 -p1 +%patch 1 -p1 +%patch 2 -p1 %build gem build %{gem_name}.gemspec @@ -63,7 +66,10 @@ ruby -rrubygems -Ilib/ -S rspec spec/ %{gem_docdir} %changelog -* Wed Jan 18 2023 Ge Wang -3.12.1-2 +* Thu Feb 27 2025 jiangxinyu - 3.12.1-3 +- Change MiniTest to Minitest + +* Wed Jan 18 2023 Ge Wang - 3.12.1-2 - Restore need_bootstrap_set flag after upgrade * Thu Jan 05 2023 Ge Wang - 3.12.1-1