diff --git a/rubygem-test_declarative-0.0.5-minitest5.patch b/rubygem-test_declarative-0.0.5-minitest5.patch deleted file mode 100644 index cf1851b..0000000 --- a/rubygem-test_declarative-0.0.5-minitest5.patch +++ /dev/null @@ -1,81 +0,0 @@ -From e05fcfffb7ccafcae89674460b2b46dd87b62b7b Mon Sep 17 00:00:00 2001 -From: Josef Stribny -Date: Mon, 19 Jan 2015 18:28:42 +0100 -Subject: [PATCH] Add support for Minitest >=5 - -- add Minitest 5 support -- change tests to work with both test/unit (if available) and Minitest 5 -- fix the test suite on Ruby 1.8.7 by explicitely requiring test/unit/testresult ---- - lib/test_declarative.rb | 1 + - test/test_declarative_test.rb | 37 ++++++++++++++++++++++++++++++++----- - test_declarative.gemspec | 1 + - 3 files changed, 34 insertions(+), 5 deletions(-) - -diff --git a/lib/test_declarative.rb b/lib/test_declarative.rb -index 34ae02b..aae5f74 100644 ---- a/lib/test_declarative.rb -+++ b/lib/test_declarative.rb -@@ -1,6 +1,7 @@ - targets = [Module] - targets << Test::Unit::TestCase if defined?(Test::Unit::TestCase) - targets << MiniTest::Unit::TestCase if defined?(MiniTest::Unit::TestCase) -+targets << Minitest::Test if defined?(Minitest::Test) - - targets.each do |target| - target.class_eval do -diff --git a/test/test_declarative_test.rb b/test/test_declarative_test.rb -index abc1278..c18ff6e 100644 ---- a/test/test_declarative_test.rb -+++ b/test/test_declarative_test.rb -@@ -1,17 +1,44 @@ - $: << File.expand_path('../../lib', __FILE__) - --require 'test/unit' -+# Test with test/unit for older Rubies -+begin -+ require 'test/unit' -+ require 'test/unit/testresult' -+ if RUBY_VERSION < '1.9.1' -+ # test/unit -+ TEST_CASE = Test::Unit::TestCase -+ RUNNER = Test::Unit::TestResult -+ MINITEST_5 = false -+ else -+ # Minitest < 5 -+ TEST_CASE = Test::Unit::TestCase -+ RUNNER = MiniTest::Unit -+ MINITEST_5 = false -+ end -+rescue LoadError -+ # Minitest >= 5 -+ require 'minitest/autorun' -+ TEST_CASE = Minitest::Test -+ RUNNER = Minitest::Unit -+ MINITEST_5 = true -+end -+ - require 'test_declarative' - --class TestDeclarativeTest < Test::Unit::TestCase -+class TestDeclarativeTest < TEST_CASE - def test_responds_to_test - assert self.class.respond_to?(:test) - end - - def test_adds_a_test_method - called = false -- assert_nothing_raised { Test::Unit::TestCase.test('some test') { called = true } } -- Test::Unit::TestCase.new(:'test_some_test').run((RUBY_VERSION < '1.9.1' ? Test::Unit::TestResult : MiniTest::Unit).new) {} -+ TEST_CASE.test('some test') { called = true } -+ case MINITEST_5 -+ when false -+ TEST_CASE.new(:'test_some_test').run(RUNNER.new) {} -+ when true -+ TEST_CASE.new(:'test_some_test').run() {} -+ end - assert called - end --end -\ No newline at end of file -+end diff --git a/rubygem-test_declarative.spec b/rubygem-test_declarative.spec index c7e026b..edbe6cd 100644 --- a/rubygem-test_declarative.spec +++ b/rubygem-test_declarative.spec @@ -1,15 +1,18 @@ %global gem_name test_declarative Summary: Simply adds a declarative test method syntax to test/unit Name: rubygem-%{gem_name} -Version: 0.0.5 -Release: 2 +Version: 0.0.6 +Release: 1 License: MIT URL: http://github.com/svenfuchs/test_declarative Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -# Minitest 5 support -# https://github.com/svenfuchs/test_declarative/pull/4 -Patch0: rubygem-test_declarative-0.0.5-minitest5.patch +# wget https://github.com/svenfuchs/test_declarative/archive/refs/tags/test_declarative-0.0.6.tar.gz +# tar -xvf test_declarative-0.0.6.tar.gz +# cd test_declarative-0.0.6 +# tar -cvf test_declarative_test-0.0.6.tar.gz test +Source1: test_declarative_test-0.0.6.tar.gz BuildRequires: ruby(release) rubygems-devel rubygem(minitest) +BuildRequires: rubygem(did_you_mean) BuildArch: noarch %description Simply adds a declarative test method syntax to test/unit. @@ -25,9 +28,6 @@ Documentation for %{name} %prep %setup -q -c -T %gem_install -n %{SOURCE0} -pushd .%{gem_instdir} -%patch0 -p1 -popd %build @@ -38,6 +38,9 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} +tar xf %{SOURCE1} +cp -r test %{buildroot}%{gem_instdir} +cd test ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)' popd @@ -50,10 +53,13 @@ popd %files doc %doc %{gem_docdir} -%doc %{gem_instdir}/README.textile +%doc %{gem_instdir}/README.md %{gem_instdir}/test %changelog +* Wed Nov 15 2023 Ge Wang - 0.0.6-1 +- update to version 0.0.6 + * Thu Aug 27 2020 tuShenmei - 0.0.5-2 - modify yaml diff --git a/test_declarative-0.0.5.gem b/test_declarative-0.0.5.gem deleted file mode 100644 index 849b3a2..0000000 Binary files a/test_declarative-0.0.5.gem and /dev/null differ diff --git a/test_declarative-0.0.6.gem b/test_declarative-0.0.6.gem new file mode 100644 index 0000000..284fc88 Binary files /dev/null and b/test_declarative-0.0.6.gem differ diff --git a/test_declarative_test-0.0.6.tar.gz b/test_declarative_test-0.0.6.tar.gz new file mode 100644 index 0000000..cba23b7 Binary files /dev/null and b/test_declarative_test-0.0.6.tar.gz differ