[rubygem-transaction-simple] Fix test suite
Josef Stribny
jstribny at fedoraproject.org
Mon Jul 7 09:47:36 UTC 2014
commit 95f23d7c03ba5e5ad58c7eb8e3f8d949c44e9c29
Author: Josef Stribny <jstribny at redhat.com>
Date: Mon Jul 7 11:47:43 2014 +0200
Fix test suite
rubygem-transaction-simple-minitest5.patch | 538 ++++++++++++++++++++++++++++
rubygem-transaction-simple.spec | 18 +-
2 files changed, 554 insertions(+), 2 deletions(-)
---
diff --git a/rubygem-transaction-simple-minitest5.patch b/rubygem-transaction-simple-minitest5.patch
new file mode 100644
index 0000000..b4890ba
--- /dev/null
+++ b/rubygem-transaction-simple-minitest5.patch
@@ -0,0 +1,538 @@
+From 66cb9c7aa27cbe88a238c47dd34bc3433f1da51b Mon Sep 17 00:00:00 2001
+From: Josef Stribny <jstribny at redhat.com>
+Date: Mon, 7 Jul 2014 11:23:02 +0200
+Subject: [PATCH] Use Minitest 5
+
+---
+ test/test_broken_graph.rb | 6 +-
+ test/test_transaction_simple.rb | 122 ++++++++++++++---------------
+ test/test_transaction_simple_group.rb | 14 ++--
+ test/test_transaction_simple_threadsafe.rb | 106 ++++++++++++-------------
+ 4 files changed, 116 insertions(+), 132 deletions(-)
+
+diff --git a/test/test_broken_graph.rb b/test/test_broken_graph.rb
+index 474390d..abeb865 100755
+--- a/test/test_broken_graph.rb
++++ b/test/test_broken_graph.rb
+@@ -3,10 +3,10 @@
+ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+
+ require 'transaction/simple'
+-require 'test/unit'
++require 'minitest'
+
+ module Transaction::Simple::Test
+- class BrokenGraph < Test::Unit::TestCase #:nodoc:
++ class BrokenGraph < Minitest::Test #:nodoc:
+ class Child
+ attr_accessor :parent
+ end
+@@ -41,7 +41,7 @@ module Transaction::Simple::Test
+ parent << Child.new
+ assert_equal(parent.object_id, parent.children[1].parent.object_id)
+ parent.abort_transaction
+- assert_not_equal(parent.object_id, parent.children[0].parent.object_id)
++ refute_equal(parent.object_id, parent.children[0].parent.object_id)
+ end
+
+ def test_fixed_graph
+diff --git a/test/test_transaction_simple.rb b/test/test_transaction_simple.rb
+index 62ad6b3..7f1b1c8 100644
+--- a/test/test_transaction_simple.rb
++++ b/test/test_transaction_simple.rb
+@@ -3,10 +3,10 @@
+ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+
+ require 'transaction/simple'
+-require 'test/unit'
++require 'minitest'
+
+ module Transaction::Simple::Test
+- class TransactionSimple < Test::Unit::TestCase #:nodoc:
++ class TransactionSimple < Minitest::Test #:nodoc:
+ VALUE = "Now is the time for all good men to come to the aid of their country."
+
+ class Value
+@@ -38,18 +38,18 @@ module Transaction::Simple::Test
+
+ def test_started
+ assert_equal(false, @value.transaction_open?)
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+ end
+
+ def test_rewind
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.rewind_transaction }
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
+- assert_not_equal(VALUE, @value)
+- assert_nothing_raised { @value.rewind_transaction }
++ @value.gsub!(/men/, 'women')
++ refute_equal(VALUE, @value)
++ @value.rewind_transaction
+ assert_equal(true, @value.transaction_open?)
+ assert_equal(VALUE, @value)
+ end
+@@ -57,11 +57,11 @@ module Transaction::Simple::Test
+ def test_abort
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.abort_transaction }
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
+- assert_not_equal(VALUE, @value)
+- assert_nothing_raised { @value.abort_transaction }
++ @value.gsub!(/men/, 'women')
++ refute_equal(VALUE, @value)
++ @value.abort_transaction
+ assert_equal(false, @value.transaction_open?)
+ assert_equal(VALUE, @value)
+ end
+@@ -69,73 +69,67 @@ module Transaction::Simple::Test
+ def test_commit
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.commit_transaction }
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
+- assert_not_equal(VALUE, @value)
++ @value.gsub!(/men/, 'women')
++ refute_equal(VALUE, @value)
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.commit_transaction }
++ @value.commit_transaction
+ assert_equal(false, @value.transaction_open?)
+- assert_not_equal(VALUE, @value)
++ refute_equal(VALUE, @value)
+ end
+
+ def test_multilevel
+ assert_equal(false, @value.transaction_open?)
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
++ @value.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.start_transaction }
+- assert_nothing_raised { @value.gsub!(/country/, 'nation-state') }
+- assert_nothing_raised { @value.commit_transaction }
++ @value.start_transaction
++ @value.gsub!(/country/, 'nation-state')
++ @value.commit_transaction
+ assert_equal(VALUE.gsub(/men/, 'women').gsub(/country/, 'nation-state'), @value)
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.abort_transaction }
++ @value.abort_transaction
+ assert_equal(VALUE, @value)
+ end
+
+ def test_multilevel_named
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.transaction_name }
+- assert_nothing_raised { @value.start_transaction(:first) } # 1
++ @value.start_transaction(:first)
+ assert_raises(Transaction::TransactionError) { @value.start_transaction(:first) }
+ assert_equal(true, @value.transaction_open?)
+ assert_equal(true, @value.transaction_open?(:first))
+ assert_equal(:first, @value.transaction_name)
+- assert_nothing_raised { @value.start_transaction } # 2
+- assert_not_equal(:first, @value.transaction_name)
++ @value.start_transaction
++ refute_equal(:first, @value.transaction_name)
+ assert_equal(nil, @value.transaction_name)
+ assert_raises(Transaction::TransactionError) { @value.abort_transaction(:second) }
+- assert_nothing_raised { @value.abort_transaction(:first) }
++ @value.abort_transaction(:first)
+ assert_equal(false, @value.transaction_open?)
+- assert_nothing_raised do
+- @value.start_transaction(:first)
+- @value.gsub!(/men/, 'women')
+- @value.start_transaction(:second)
+- @value.gsub!(/women/, 'people')
+- @value.start_transaction
+- @value.gsub!(/people/, 'sentients')
+- end
+- assert_nothing_raised { @value.abort_transaction(:second) }
++ @value.start_transaction(:first)
++ @value.gsub!(/men/, 'women')
++ @value.start_transaction(:second)
++ @value.gsub!(/women/, 'people')
++ @value.start_transaction
++ @value.gsub!(/people/, 'sentients')
++ @value.abort_transaction(:second)
+ assert_equal(true, @value.transaction_open?(:first))
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+- assert_nothing_raised do
+- @value.start_transaction(:second)
+- @value.gsub!(/women/, 'people')
+- @value.start_transaction
+- @value.gsub!(/people/, 'sentients')
+- end
++ @value.start_transaction(:second)
++ @value.gsub!(/women/, 'people')
++ @value.start_transaction
++ @value.gsub!(/people/, 'sentients')
+ assert_raises(Transaction::TransactionError) { @value.rewind_transaction(:foo) }
+- assert_nothing_raised { @value.rewind_transaction(:second) }
++ @value.rewind_transaction(:second)
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+- assert_nothing_raised do
+- @value.gsub!(/women/, 'people')
+- @value.start_transaction
+- @value.gsub!(/people/, 'sentients')
+- end
++ @value.gsub!(/women/, 'people')
++ @value.start_transaction
++ @value.gsub!(/people/, 'sentients')
+ assert_raises(Transaction::TransactionError) { @value.commit_transaction(:foo) }
+- assert_nothing_raised { @value.commit_transaction(:first) }
++ @value.commit_transaction(:first)
+ assert_equal(VALUE.gsub(/men/, 'sentients'), @value)
+ assert_equal(false, @value.transaction_open?)
+ end
+@@ -143,7 +137,7 @@ module Transaction::Simple::Test
+ def test_block
+ Transaction::Simple.start(@value) do |tv|
+ assert_equal(true, tv.transaction_open?)
+- assert_nothing_raised { tv.gsub!(/men/, 'women') }
++ tv.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), tv)
+ tv.abort_transaction
+ flunk("Failed to abort the transaction.")
+@@ -154,7 +148,7 @@ module Transaction::Simple::Test
+ @value = VALUE.dup
+ Transaction::Simple.start(@value) do |tv|
+ assert_equal(true, tv.transaction_open?)
+- assert_nothing_raised { tv.gsub!(/men/, 'women') }
++ tv.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), tv)
+ tv.commit_transaction
+ flunk("Failed to commit the transaction.")
+@@ -167,7 +161,7 @@ module Transaction::Simple::Test
+ Transaction::Simple.start_named(:first, @value) do |tv|
+ assert_equal(true, tv.transaction_open?)
+ assert_equal(true, tv.transaction_open?(:first))
+- assert_nothing_raised { tv.gsub!(/men/, 'women') }
++ tv.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), tv)
+ tv.abort_transaction
+ flunk("Failed to abort the transaction.")
+@@ -180,7 +174,7 @@ module Transaction::Simple::Test
+ Transaction::Simple.start_named(:first, @value) do |tv|
+ assert_equal(true, tv.transaction_open?)
+ assert_equal(true, tv.transaction_open?(:first))
+- assert_nothing_raised { tv.gsub!(/men/, 'women') }
++ tv.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), tv)
+ tv.commit_transaction
+ flunk("Failed to commit the transaction.")
+@@ -196,7 +190,7 @@ module Transaction::Simple::Test
+ assert_equal(true, tv.transaction_open?)
+ assert_equal(true, tv.transaction_open?(:first))
+ assert_equal(true, tv.transaction_open?(:second))
+- assert_nothing_raised { tv.gsub!(/men/, 'women') }
++ tv.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), tv)
+ assert_raises(Transaction::TransactionError) do
+ tv.abort_transaction(:first)
+@@ -206,7 +200,7 @@ module Transaction::Simple::Test
+ assert_equal(true, @value.transaction_open?(:first))
+ assert_equal(false, @value.transaction_open?(:second))
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+- assert_nothing_raised { @value.abort_transaction(:first) }
++ @value.abort_transaction(:first)
+ assert_equal(VALUE, @value)
+
+ @value.start_transaction(:first)
+@@ -214,7 +208,7 @@ module Transaction::Simple::Test
+ assert_equal(true, tv.transaction_open?)
+ assert_equal(true, tv.transaction_open?(:first))
+ assert_equal(true, tv.transaction_open?(:second))
+- assert_nothing_raised { tv.gsub!(/men/, 'women') }
++ tv.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), tv)
+ assert_raises(Transaction::TransactionError) do
+ tv.commit_transaction(:first)
+@@ -224,7 +218,7 @@ module Transaction::Simple::Test
+ assert_equal(true, @value.transaction_open?(:first))
+ assert_equal(false, @value.transaction_open?(:second))
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+- assert_nothing_raised { @value.abort_transaction(:first) }
++ @value.abort_transaction(:first)
+ assert_equal(VALUE, @value)
+ end
+
+@@ -272,17 +266,15 @@ module Transaction::Simple::Test
+ end
+
+ def test_array
+- assert_nothing_raised do
+- @orig = ["first", "second", "third"]
+- @value = ["first", "second", "third"]
+- @value.extend(Transaction::Simple)
+- end
++ @orig = ["first", "second", "third"]
++ @value = ["first", "second", "third"]
++ @value.extend(Transaction::Simple)
+ assert_equal(@orig, @value)
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value[1].gsub!(/second/, "fourth") }
+- assert_not_equal(@orig, @value)
+- assert_nothing_raised { @value.abort_transaction }
++ @value[1].gsub!(/second/, "fourth")
++ refute_equal(@orig, @value)
++ @value.abort_transaction
+ assert_equal(@orig, @value)
+ end
+
+diff --git a/test/test_transaction_simple_group.rb b/test/test_transaction_simple_group.rb
+index 10bd86f..9730586 100644
+--- a/test/test_transaction_simple_group.rb
++++ b/test/test_transaction_simple_group.rb
+@@ -3,10 +3,10 @@
+ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+
+ require 'transaction/simple/group'
+-require 'test/unit'
++require 'minitest'
+
+ module Transaction::Simple::Test
+- class Group < Test::Unit::TestCase #:nodoc:
++ class Group < Minitest::Test #:nodoc:
+ VALUE1 = "Hello, you."
+ VALUE2 = "And you, too."
+
+@@ -18,7 +18,7 @@ module Transaction::Simple::Test
+ def test_group
+ group = Transaction::Simple::Group.new(@x, @y)
+
+- assert_nothing_raised { group.start_transaction(:first) }
++ group.start_transaction(:first)
+ assert_equal(true, group.transaction_open?(:first))
+ assert_equal(true, @x.transaction_open?(:first))
+ assert_equal(true, @y.transaction_open?(:first))
+@@ -26,22 +26,22 @@ module Transaction::Simple::Test
+ assert_equal("Hello, world.", @x.gsub!(/you/, "world"))
+ assert_equal("And me, too.", @y.gsub!(/you/, "me"))
+
+- assert_nothing_raised { group.start_transaction(:second) }
++ group.start_transaction(:second)
+ assert_equal("Hello, HAL.", @x.gsub!(/world/, "HAL"))
+ assert_equal("And Dave, too.", @y.gsub!(/me/, "Dave"))
+
+- assert_nothing_raised { group.rewind_transaction(:second) }
++ group.rewind_transaction(:second)
+ assert_equal("Hello, world.", @x)
+ assert_equal("And me, too.", @y)
+
+ assert_equal("Hello, HAL.", @x.gsub!(/world/, "HAL"))
+ assert_equal("And Dave, too.", @y.gsub!(/me/, "Dave"))
+
+- assert_nothing_raised { group.commit_transaction(:second) }
++ group.commit_transaction(:second)
+ assert_equal("Hello, HAL.", @x)
+ assert_equal("And Dave, too.", @y)
+
+- assert_nothing_raised { group.abort_transaction(:first) }
++ group.abort_transaction(:first)
+ assert_equal("Hello, you.", @x)
+ assert_equal("And you, too.", @y)
+ end
+diff --git a/test/test_transaction_simple_threadsafe.rb b/test/test_transaction_simple_threadsafe.rb
+index c3a7dbb..dcf4d4c 100644
+--- a/test/test_transaction_simple_threadsafe.rb
++++ b/test/test_transaction_simple_threadsafe.rb
+@@ -3,10 +3,10 @@
+ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+
+ require 'transaction/simple/threadsafe'
+-require 'test/unit'
++require 'minitest'
+
+ module Transaction::Simple::Test
+- class ThreadSafe < Test::Unit::TestCase #:nodoc:
++ class ThreadSafe < Minitest::Test #:nodoc:
+ VALUE = "Now is the time for all good men to come to the aid of their country."
+
+ def setup
+@@ -20,18 +20,18 @@ module Transaction::Simple::Test
+
+ def test_started
+ assert_equal(false, @value.transaction_open?)
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+ end
+
+ def test_rewind
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.rewind_transaction }
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
+- assert_not_equal(VALUE, @value)
+- assert_nothing_raised { @value.rewind_transaction }
++ @value.gsub!(/men/, 'women')
++ refute_equal(VALUE, @value)
++ @value.rewind_transaction
+ assert_equal(true, @value.transaction_open?)
+ assert_equal(VALUE, @value)
+ end
+@@ -39,11 +39,11 @@ module Transaction::Simple::Test
+ def test_abort
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.abort_transaction }
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
+- assert_not_equal(VALUE, @value)
+- assert_nothing_raised { @value.abort_transaction }
++ @value.gsub!(/men/, 'women')
++ refute_equal(VALUE, @value)
++ @value.abort_transaction
+ assert_equal(false, @value.transaction_open?)
+ assert_equal(VALUE, @value)
+ end
+@@ -51,89 +51,81 @@ module Transaction::Simple::Test
+ def test_commit
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.commit_transaction }
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
+- assert_not_equal(VALUE, @value)
++ @value.gsub!(/men/, 'women')
++ refute_equal(VALUE, @value)
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.commit_transaction }
++ @value.commit_transaction
+ assert_equal(false, @value.transaction_open?)
+- assert_not_equal(VALUE, @value)
++ refute_equal(VALUE, @value)
+ end
+
+ def test_multilevel
+ assert_equal(false, @value.transaction_open?)
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.gsub!(/men/, 'women') }
++ @value.gsub!(/men/, 'women')
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.start_transaction }
+- assert_nothing_raised { @value.gsub!(/country/, 'nation-state') }
+- assert_nothing_raised { @value.commit_transaction }
++ @value.start_transaction
++ @value.gsub!(/country/, 'nation-state')
++ @value.commit_transaction
+ assert_equal(VALUE.gsub(/men/, 'women').gsub(/country/, 'nation-state'), @value)
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value.abort_transaction }
++ @value.abort_transaction
+ assert_equal(VALUE, @value)
+ end
+
+ def test_multilevel_named
+ assert_equal(false, @value.transaction_open?)
+ assert_raises(Transaction::TransactionError) { @value.transaction_name }
+- assert_nothing_raised { @value.start_transaction(:first) } # 1
++ @value.start_transaction(:first)
+ assert_raises(Transaction::TransactionError) { @value.start_transaction(:first) }
+ assert_equal(true, @value.transaction_open?)
+ assert_equal(true, @value.transaction_open?(:first))
+ assert_equal(:first, @value.transaction_name)
+- assert_nothing_raised { @value.start_transaction } # 2
+- assert_not_equal(:first, @value.transaction_name)
++ @value.start_transaction
++ refute_equal(:first, @value.transaction_name)
+ assert_equal(nil, @value.transaction_name)
+ assert_raises(Transaction::TransactionError) { @value.abort_transaction(:second) }
+- assert_nothing_raised { @value.abort_transaction(:first) }
++ @value.abort_transaction(:first)
+ assert_equal(false, @value.transaction_open?)
+- assert_nothing_raised do
+- @value.start_transaction(:first)
+- @value.gsub!(/men/, 'women')
+- @value.start_transaction(:second)
+- @value.gsub!(/women/, 'people')
+- @value.start_transaction
+- @value.gsub!(/people/, 'sentients')
+- end
+- assert_nothing_raised { @value.abort_transaction(:second) }
++ @value.start_transaction(:first)
++ @value.gsub!(/men/, 'women')
++ @value.start_transaction(:second)
++ @value.gsub!(/women/, 'people')
++ @value.start_transaction
++ @value.gsub!(/people/, 'sentients')
++ @value.abort_transaction(:second)
+ assert_equal(true, @value.transaction_open?(:first))
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+- assert_nothing_raised do
+- @value.start_transaction(:second)
+- @value.gsub!(/women/, 'people')
+- @value.start_transaction
+- @value.gsub!(/people/, 'sentients')
+- end
++ @value.start_transaction(:second)
++ @value.gsub!(/women/, 'people')
++ @value.start_transaction
++ @value.gsub!(/people/, 'sentients')
+ assert_raises(Transaction::TransactionError) { @value.rewind_transaction(:foo) }
+- assert_nothing_raised { @value.rewind_transaction(:second) }
++ @value.rewind_transaction(:second)
+ assert_equal(VALUE.gsub(/men/, 'women'), @value)
+- assert_nothing_raised do
+- @value.gsub!(/women/, 'people')
+- @value.start_transaction
+- @value.gsub!(/people/, 'sentients')
+- end
++ @value.gsub!(/women/, 'people')
++ @value.start_transaction
++ @value.gsub!(/people/, 'sentients')
+ assert_raises(Transaction::TransactionError) { @value.commit_transaction(:foo) }
+- assert_nothing_raised { @value.commit_transaction(:first) }
++ @value.commit_transaction(:first)
+ assert_equal(VALUE.gsub(/men/, 'sentients'), @value)
+ assert_equal(false, @value.transaction_open?)
+ end
+
+ def test_array
+- assert_nothing_raised do
+- @orig = ["first", "second", "third"]
+- @value = ["first", "second", "third"]
+- @value.extend(Transaction::Simple::ThreadSafe)
+- end
++ @orig = ["first", "second", "third"]
++ @value = ["first", "second", "third"]
++ @value.extend(Transaction::Simple::ThreadSafe)
+ assert_equal(@orig, @value)
+- assert_nothing_raised { @value.start_transaction }
++ @value.start_transaction
+ assert_equal(true, @value.transaction_open?)
+- assert_nothing_raised { @value[1].gsub!(/second/, "fourth") }
+- assert_not_equal(@orig, @value)
+- assert_nothing_raised { @value.abort_transaction }
++ @value[1].gsub!(/second/, "fourth")
++ refute_equal(@orig, @value)
++ @value.abort_transaction
+ assert_equal(@orig, @value)
+ end
+ end
+--
+1.8.3.1
+
diff --git a/rubygem-transaction-simple.spec b/rubygem-transaction-simple.spec
index 19250d3..cfeec76 100644
--- a/rubygem-transaction-simple.spec
+++ b/rubygem-transaction-simple.spec
@@ -10,11 +10,14 @@
Summary: Simple object transaction support for Ruby
Name: rubygem-%{gem_name}
Version: 1.4.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Group: Development/Languages
License: MIT
URL: http://trans-simple.rubyforge.org/
Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
+# Use minitest 5
+# https://github.com/halostatue/transaction-simple/pull/5
+Patch0: rubygem-transaction-simple-minitest5.patch
Requires: rubygems
%if 0%{?rhel} == 6
Requires: ruby(abi) = 1.8
@@ -29,7 +32,11 @@ Requires: ruby(release)
BuildRequires: rubygems-devel
%endif
BuildRequires: rubygems
+%if 0%{?fedora} >= 20
+BuildRequires: rubygem(minitest) >= 5.0.0
+%else
BuildRequires: rubygem(minitest)
+%endif
BuildArch: noarch
Provides: rubygem(%{gem_name}) = %{version}
@@ -55,7 +62,6 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
sed -i '/s.cert_chain = nil/d' %{gem_name}.gemspec
%build
-
# Create the gem as gem install only works on a gem file
gem build %{gem_name}.gemspec
@@ -74,7 +80,12 @@ rm %{buildroot}%{gem_instdir}/.gemtest
chmod a-x %{buildroot}%{gem_instdir}/test/test_broken_graph.rb
%check
+%if 0%{?fedora} >= 20
+cat %PATCH0 | patch -p1
+ruby -Ilib -rminitest/autorun -e "Dir.glob './test/test_*.rb', &method(:require)"
+%else
testrb -Ilib test/test_*.rb
+%endif
%files
%doc Licence.rdoc
@@ -92,6 +103,9 @@ testrb -Ilib test/test_*.rb
%{gem_instdir}/test
%changelog
+* Mon Jul 07 2014 Josef Stribny <jstribny at redhat.com> - 1.4.0.2-9
+- Fix tests for minitest 5
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list