[DRE-commits] [SCM] ruby-webmock.git branch, master, updated. upstream/1.11.0-17-g02389a3

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit e14315005053676158a553987a073e1f40a87efb
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun May 26 19:01:55 2013 +0530

    port more tests to minitest5

diff --git a/debian/patches/remove-rubygems-in-tests.patch b/debian/patches/remove-rubygems-in-tests.patch
deleted file mode 100644
index d023e05..0000000
--- a/debian/patches/remove-rubygems-in-tests.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Description: remove usage of rubygems in tests
-Author: Cédric Boutillier <boutil 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'
- 
-@@ -26,4 +26,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,7 +1,7 @@
--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'
---- 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'
diff --git a/debian/patches/remove-rubygems-port-to-minitest5.patch b/debian/patches/remove-rubygems-port-to-minitest5.patch
new file mode 100644
index 0000000..4f84138
--- /dev/null
+++ b/debian/patches/remove-rubygems-port-to-minitest5.patch
@@ -0,0 +1,145 @@
+Description: remove usage of rubygems in tests
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2013-05-24
+
+--- a/minitest/test_helper.rb
++++ b/minitest/test_helper.rb
+@@ -1,12 +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 File.expand_path(File.dirname(__FILE__) + '/../test/http_request')
+ 
+-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 @@
+-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 '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
+--- 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
+--- 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

-- 
ruby-webmock.git