[DRE-commits] [ruby-webmock] 04/04: refresh remove-rubygems-port-to-minitest5.patch

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-webmock.

commit d2c5aff20d278ddf4f4223266ff2ed706cdbb05f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 14 22:44:33 2014 +0530

    refresh remove-rubygems-port-to-minitest5.patch
---
 .../remove-rubygems-port-to-minitest5.patch        | 64 ++++------------------
 1 file changed, 12 insertions(+), 52 deletions(-)

diff --git a/debian/patches/remove-rubygems-port-to-minitest5.patch b/debian/patches/remove-rubygems-port-to-minitest5.patch
index 9654d2b..cfd921c 100644
--- a/debian/patches/remove-rubygems-port-to-minitest5.patch
+++ b/debian/patches/remove-rubygems-port-to-minitest5.patch
@@ -7,57 +7,35 @@ Last-Update: 2013-05-24
 
 --- a/minitest/test_helper.rb
 +++ b/minitest/test_helper.rb
-@@ -1,12 +1,13 @@
+@@ -1,11 +1,11 @@
 -require 'rubygems'
-+#require 'rubygems'
++# require 'rubygems'
  
 -$LOAD_PATH.unshift(File.dirname(__FILE__))
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-+#$LOAD_PATH.unshift(File.dirname(__FILE__))
-+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
++# $LOAD_PATH.unshift(File.dirname(__FILE__))
++# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
  
  require File.expand_path(File.dirname(__FILE__) + '/../test/http_request')
  
--gem "minitest"
-+#gem "minitest"
+-gem 'minitest'
++# gem 'minitest'
+ 
  require 'minitest/autorun'
-+require 'minitest/test'
  require 'webmock/minitest'
- 
- class MiniTest::Test
-@@ -26,4 +27,4 @@
-    def assert_fail(message, &block)
-      assert_raise_with_message(MiniTest::Assertion, message, &block)
-    end
--end
-\ No newline at end of file
-+end
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
-@@ -1,15 +1,16 @@
+@@ -1,7 +1,7 @@
 -require 'rubygems'
-+#require 'rubygems'
++# require 'rubygems'
  
 -$LOAD_PATH.unshift(File.dirname(__FILE__))
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-+#$LOAD_PATH.unshift(File.dirname(__FILE__))
-+#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
++# $LOAD_PATH.unshift(File.dirname(__FILE__))
++# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
  
  require 'webmock/test_unit'
--require 'test/unit'
-+#require 'test/unit'
-+require 'minitest/autorun'
- 
--class Test::Unit::TestCase
--  AssertionFailedError =  Test::Unit::AssertionFailedError rescue MiniTest::Assertion
-+class Minitest::Test
-+  AssertionFailedError =  Minitest::AssertionFailedError rescue MiniTest::Assertion
-   def assert_raise_with_message(e, message, &block)
--    e = assert_raise(e, &block)
-+    e = assert_raises(e, &block)
-     if message.is_a?(Regexp)
-       assert_match(message, e.message)
-     else
+ require 'test/unit'
 --- a/spec/acceptance/net_http/real_net_http_spec.rb
 +++ b/spec/acceptance/net_http/real_net_http_spec.rb
 @@ -1,4 +1,4 @@
@@ -127,21 +105,3 @@ Last-Update: 2013-05-24
 +class TestWebMock < Minitest::Test
    include SharedTest
  end
---- a/test/shared_test.rb
-+++ b/test/shared_test.rb
-@@ -10,13 +10,13 @@
-   end
- 
-   def test_assert_requested_with_stub_and_block_raises_error
--    assert_raise ArgumentError do
-+    assert_raises ArgumentError do
-       assert_requested(@stub_http) {}
-     end
-   end
- 
-   def test_assert_not_requested_with_stub_and_block_raises_error
--    assert_raise ArgumentError do
-+    assert_raises ArgumentError do
-       assert_not_requested(@stub_http) {}
-     end
-   end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-webmock.git