[DRE-commits] [ruby-webmock] 02/04: remove already applied 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 6dd1b5793250455885f6baed863bd2417c65a8cf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 14 22:25:20 2014 +0530

    remove already applied patch
---
 debian/patches/port_to_minitest5.patch | 75 ----------------------------------
 debian/patches/series                  |  1 -
 2 files changed, 76 deletions(-)

diff --git a/debian/patches/port_to_minitest5.patch b/debian/patches/port_to_minitest5.patch
deleted file mode 100644
index 5176c3f..0000000
--- a/debian/patches/port_to_minitest5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: Port to Minitest 5.0
-From: Tim Kurvers <tim at moonsphere.net>
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Origin: https://github.com/bblimke/webmock/pull/281
-Date: 2013-05-24
-
----
- lib/webmock/minitest.rb  | 4 ++--
- minitest/test_helper.rb  | 9 ++++++---
- minitest/test_webmock.rb | 3 +--
- 3 files changed, 9 insertions(+), 7 deletions(-)
-
---- a/lib/webmock/minitest.rb
-+++ b/lib/webmock/minitest.rb
-@@ -1,7 +1,7 @@
--require 'minitest/unit'
-+require 'minitest/test'
- require 'webmock'
- 
--MiniTest::Unit::TestCase.class_eval do
-+MiniTest::Test.class_eval do
-   include WebMock::API
- 
-   alias_method :teardown_without_webmock, :teardown
-@@ -14,7 +14,7 @@
-   [:assert_request_requested, :assert_request_not_requested].each do |name|
-     alias_method :"#{name}_without_assertions_count", name
-     define_method :"#{name}_with_assertions_count" do |*args|
--      self._assertions += 1
-+      self.assertions += 1
-       send :"#{name}_without_assertions_count", *args
-     end
-     alias_method name, :"#{name}_with_assertions_count"
---- a/minitest/test_helper.rb
-+++ b/minitest/test_helper.rb
-@@ -9,7 +9,7 @@
- require 'minitest/autorun'
- require 'webmock/minitest'
- 
--class MiniTest::Unit::TestCase
-+class MiniTest::Test
-   def assert_raise(*exp, &block)
-     assert_raises(*exp, &block)
-   end
---- a/minitest/test_webmock.rb
-+++ b/minitest/test_webmock.rb
-@@ -1,7 +1,6 @@
- require File.expand_path(File.dirname(__FILE__) + '/test_helper')
- require File.expand_path(File.dirname(__FILE__) + '/../test/shared_test')
- 
--class MiniTestWebMock < MiniTest::Unit::TestCase
-+class MiniTestWebMock < MiniTest::Test
-   include SharedTest
--
- end
---- a/minitest/webmock_spec.rb
-+++ b/minitest/webmock_spec.rb
-@@ -9,14 +9,14 @@
-     end
- 
-     it "should update assertions count" do
--      assert_equal 0, _assertions
-+      assert_equal 0, assertions
-       http_request(:get, "http://www.example.com/")
- 
-       assert_requested(@stub_http)
--      assert_equal 2, _assertions
-+      assert_equal 2, assertions
- 
-       assert_not_requested(:post, "http://www.example.com")
--      assert_equal 4, _assertions
-+      assert_equal 4, assertions
-     end
- 
-     it "should raise error on non stubbed request" do
diff --git a/debian/patches/series b/debian/patches/series
index cd6fe66..39b03df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-port_to_minitest5.patch
 remove-rubygems-curb-version-check.patch
 skip-gem-building-whitespace-tests.patch
 remove-rubygems-port-to-minitest5.patch

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