webmock 1.12.0 → 1.12.1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 
+## 1.12.1
+
+* Fixed Minitest < 5.0 compatibility
+
 ## 1.12.0
 
 * Not using Gem spec anymore to check loaded Curb version.

data/lib/webmock/minitest.rb

@@ -1,7 +1,16 @@
-require 'minitest/test'
+begin
+  require 'minitest/test'
+  test_class= MiniTest::Test
+  assertions = "assertions"
+rescue LoadError
+  require "minitest/unit"
+  test_class = MiniTest::Unit::TestCase
+  assertions = "_assertions"
+end
+
 require 'webmock'
 
-MiniTest::Test.class_eval do
+test_class.class_eval do
   include WebMock::API
 
   alias_method :teardown_without_webmock, :teardown
@@ -14,7 +23,7 @@ MiniTest::Test.class_eval do
   [: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.send("#{assertions}=", self.send("#{assertions}") + 1)
       send :"#{name}_without_assertions_count", *args
     end
     alias_method name, :"#{name}_with_assertions_count"

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.12.0' unless defined?(::WebMock::VERSION)
+  VERSION = '1.12.1' unless defined?(::WebMock::VERSION)
 end

data/minitest/test_helper.rb

@@ -10,7 +10,9 @@ gem 'minitest'
 require 'minitest/autorun'
 require 'webmock/minitest'
 
-class MiniTest::Test
+test_class = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
+
+test_class.class_eval do
 
   def assert_raise(*exp, &block)
     assert_raises(*exp, &block)

data/minitest/test_webmock.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../test/shared_test')
 
-class MiniTestWebMock < MiniTest::Test
+test_class = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
+
+
+class MiniTestWebMock < test_class
   include SharedTest
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 1
   - 12
-  - 0
-  version: 1.12.0
+  - 1
+  version: 1.12.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-25 00:00:00 Z
+date: 2013-06-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable