[DRE-commits] [ruby-webmock] 02/02: drop port to 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 bbb4642c81f6744e6372bad1d3ae07411a2540dc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Apr 19 19:51:53 2014 +0530

    drop port to remove-rubygems-port-to-minitest5.patch
---
 .../remove-rubygems-port-to-minitest5.patch        | 116 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 117 deletions(-)

diff --git a/debian/patches/remove-rubygems-port-to-minitest5.patch b/debian/patches/remove-rubygems-port-to-minitest5.patch
deleted file mode 100644
index 33afbef..0000000
--- a/debian/patches/remove-rubygems-port-to-minitest5.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Description: remove usage of rubygems in tests
- Also port test unit tests to minitest
-Author: Cédric Boutillier <boutil at debian.org>
-        Praveen Arimbrathodiyil <praveen at debian.org>
-Forwarded: no
-Last-Update: 2013-05-24
-
---- a/minitest/test_helper.rb
-+++ b/minitest/test_helper.rb
-@@ -1,11 +1,11 @@
--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'))
- 
- require File.expand_path(File.dirname(__FILE__) + '/../test/http_request')
- 
--gem 'minitest'
-+# gem 'minitest'
- 
- require 'minitest/autorun'
- require 'webmock/minitest'
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,13 +1,13 @@
--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'))
- 
- require 'webmock/test_unit'
--require 'test/unit'
-+require 'minitest/autorun'
- 
--class Test::Unit::TestCase
--  AssertionFailedError =  Test::Unit::AssertionFailedError rescue MiniTest::Assertion
-+class Minitest::Test
-+  AssertionFailedError =   Minitest::Test::AssertionFailedError rescue MiniTest::Assertion
-   def assert_raise_with_message(e, message, &block)
-     e = assert_raises(e, &block)
-     if message.is_a?(Regexp)
---- a/spec/acceptance/net_http/real_net_http_spec.rb
-+++ b/spec/acceptance/net_http/real_net_http_spec.rb
-@@ -1,4 +1,4 @@
--require 'rubygems'
-+#require 'rubygems'
- require 'rspec'
- require 'net/http'
- require 'net/https'
-@@ -17,4 +17,4 @@
-   end
- 
-   it_should_behave_like "Net::HTTP"
--end
-\ No newline at end of file
-+end
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,4 +1,5 @@
--require 'rubygems'
-+# all dependencies are covered in debian/control
-+# require 'rubygems'
- require 'httpclient'
- unless RUBY_PLATFORM =~ /java/
-   require 'curb'
-@@ -7,8 +8,8 @@
-   require 'typhoeus'
- end
- 
--$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 'rspec'
- 
- require 'webmock/rspec'
---- a/lib/webmock/test_unit.rb
-+++ b/lib/webmock/test_unit.rb
-@@ -1,9 +1,9 @@
--require 'test/unit'
-+#require 'test/unit'
-+require 'minitest/autorun'
- require 'webmock'
- 
--module Test
--  module Unit
--    class TestCase
-+module Minitest
-+    class Test
-       include WebMock::API
- 
-       alias_method :teardown_without_webmock, :teardown
-@@ -14,7 +14,6 @@
-       alias_method :teardown, :teardown_with_webmock
- 
-     end
--  end
- end
- 
- WebMock::AssertionFailure.error_class = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat
---- a/test/test_webmock.rb
-+++ b/test/test_webmock.rb
-@@ -1,6 +1,6 @@
- require File.expand_path(File.dirname(__FILE__) + '/test_helper')
- require File.expand_path(File.dirname(__FILE__) + '/shared_test')
- 
--class TestWebMock < Test::Unit::TestCase
-+class TestWebMock < Minitest::Test
-   include SharedTest
- end
diff --git a/debian/patches/series b/debian/patches/series
index c42fd50..be1633d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 remove-rubygems-curb-version-check.patch
 skip-gem-building-whitespace-tests.patch
-remove-rubygems-port-to-minitest5.patch
 deactivate_tests_with_network.patch
 skip-patron-segfault-test.patch
 skip-excon-incompatible-test.patch

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