mocha 0.12.1 → 0.12.2

data/RELEASE.rdoc

@@ -1,3 +1,6 @@
+= 0.12.2
+* Officially support minitest v3.3.0 (still monkey-patching)
+
 = 0.12.1
 * Deprecation warning (instead of fail fast) if neither Test::Unit nor MiniTest is loaded. Fixes #88.
 * Remove deprecated access to `Mocha::Standalone`.

data/lib/mocha.rb

@@ -1,4 +1,4 @@
 require 'mocha/version'
-require 'mocha/integration'
+require 'mocha/monkey_patching'
 require 'mocha_standalone'
 require 'mocha/configuration'

data/lib/mocha/expectation_error.rb

@@ -1,15 +1,3 @@
-require 'mocha/backtrace_filter'
-
 module Mocha
-
-  class ExpectationError < Exception
-
-    def initialize(message = nil, backtrace = [])
-      super(message)
-      filter = BacktraceFilter.new
-      set_backtrace(filter.filtered(backtrace))
-    end
-
-  end
-
+  class ExpectationError < Exception; end
 end

data/lib/mocha/expectation_error_factory.rb

@@ -0,0 +1,17 @@
+require 'mocha/backtrace_filter'
+require 'mocha/expectation_error'
+
+module Mocha
+  class ExpectationErrorFactory
+    class << self
+      attr_accessor :exception_class
+      def build(message = nil, backtrace = [])
+        self.exception_class ||= ExpectationError
+        exception = exception_class.new(message)
+        filter = BacktraceFilter.new
+        exception.set_backtrace(filter.filtered(backtrace))
+        exception
+      end
+    end
+  end
+end

data/lib/mocha/mock.rb

@@ -6,6 +6,7 @@ require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/unexpected_invocation'
 require 'mocha/argument_iterator'
+require 'mocha/expectation_error_factory'
 
 module Mocha
 
@@ -202,7 +203,7 @@ module Mocha
           matching_expectation.invoke(&block) if matching_expectation
           message = UnexpectedInvocation.new(self, symbol, *arguments).to_s
           message << @mockery.mocha_inspect
-          raise ExpectationError.new(message, caller)
+          raise ExpectationErrorFactory.build(message, caller)
         end
       end
     end

data/lib/mocha/mockery.rb

@@ -5,6 +5,7 @@ require 'mocha/state_machine'
 require 'mocha/logger'
 require 'mocha/configuration'
 require 'mocha/stubbing_error'
+require 'mocha/expectation_error_factory'
 
 module Mocha
 
@@ -50,7 +51,7 @@ module Mocha
         else
           backtrace = unsatisfied_expectations[0].backtrace
         end
-        raise ExpectationError.new(message, backtrace)
+        raise ExpectationErrorFactory.build(message, backtrace)
       end
       expectations.each do |e|
         unless Mocha::Configuration.allow?(:stubbing_method_unnecessarily)

data/lib/mocha/{integration.rb → monkey_patching.rb}

@@ -3,17 +3,17 @@ require 'mocha/deprecation'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     class << self
 
       def monkey_patches
         patches = []
         if test_unit_testcase_defined? && !test_unit_testcase_inherits_from_miniunit_testcase?
-          patches << 'mocha/integration/test_unit'
+          patches << 'mocha/monkey_patching/test_unit'
         end
         if mini_test_testcase_defined?
-          patches << 'mocha/integration/mini_test'
+          patches << 'mocha/monkey_patching/mini_test'
         end
         patches
       end
@@ -36,11 +36,11 @@ module Mocha
 
 end
 
-unless Mocha::Integration.monkey_patches.any?
+unless Mocha::MonkeyPatching.monkey_patches.any?
   Mocha::Deprecation.warning("Test::Unit or MiniTest must be loaded *before* Mocha.")
   Mocha::Deprecation.warning("If you're integrating with another test library, you should probably require 'mocha_standalone' instead of 'mocha'")
 end
 
-Mocha::Integration.monkey_patches.each do |patch|
+Mocha::MonkeyPatching.monkey_patches.each do |patch|
   require patch
 end

data/lib/mocha/monkey_patching/mini_test.rb

@@ -0,0 +1,62 @@
+require 'mocha/api'
+require 'mocha/options'
+
+if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
+
+  require 'mocha/monkey_patching/mini_test/exception_translation'
+  require 'mocha/monkey_patching/mini_test/version_13'
+  require 'mocha/monkey_patching/mini_test/version_140'
+  require 'mocha/monkey_patching/mini_test/version_141'
+  require 'mocha/monkey_patching/mini_test/version_142_to_172'
+  require 'mocha/monkey_patching/mini_test/version_200'
+  require 'mocha/monkey_patching/mini_test/version_201_to_222'
+  require 'mocha/monkey_patching/mini_test/version_230_to_2101'
+  require 'mocha/monkey_patching/mini_test/version_2110_to_2111'
+  require 'mocha/monkey_patching/mini_test/version_2112_to_320'
+  require 'mocha/monkey_patching/mini_test/version_330'
+
+  module MiniTest
+    class Unit
+      class TestCase
+
+        include Mocha::API
+
+        alias_method :run_before_mocha, :run
+        remove_method :run
+
+        mini_test_version = begin
+          Gem::Version.new(MiniTest::Unit::VERSION)
+        rescue LoadError
+          Gem::Version.new('0.0.0')
+        end
+
+        $stderr.puts "Detected MiniTest version: #{mini_test_version}" if $mocha_options['debug']
+
+        if Gem::Requirement.new('>= 1.3.0', '<= 1.3.1').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version13
+        elsif Gem::Requirement.new('1.4.0').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version140
+        elsif Gem::Requirement.new('1.4.1').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version141
+        elsif Gem::Requirement.new('>= 1.4.2', '<= 1.7.2').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version142To172
+        elsif Gem::Requirement.new('2.0.0').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version200
+        elsif Gem::Requirement.new('>= 2.0.1', '<= 2.2.2').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version201To222
+        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.10.1').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version230To2101
+        elsif Gem::Requirement.new('>= 2.11.0', '<= 2.11.1').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version2110To2111
+        elsif Gem::Requirement.new('>= 2.11.2', '<= 3.2.0').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version2112To320
+        elsif Gem::Requirement.new('3.3.0').satisfied_by?(mini_test_version)
+          include Mocha::MonkeyPatching::MiniTest::Version330
+        else
+          $stderr.puts "*** No Mocha monkey-patch for MiniTest version ***" if $mocha_options['debug']
+        end
+
+      end
+    end
+  end
+end

data/lib/mocha/{integration → monkey_patching}/mini_test/assertion_counter.rb

@@ -1,6 +1,6 @@
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -11,7 +11,7 @@ module Mocha
         end
 
         def increment
-          @test_case._assertions += 1
+          @test_case.assert(true)
         end
 
       end

data/lib/mocha/{integration → monkey_patching}/mini_test/exception_translation.rb

@@ -2,7 +2,7 @@ require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 

data/lib/mocha/{integration → monkey_patching}/mini_test/version_13.rb

@@ -1,8 +1,8 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -22,12 +22,12 @@ module Mocha
               @passed = true
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, self.name, Mocha::MonkeyPatching::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue Exception => e
-                result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, self.name, Mocha::MonkeyPatching::MiniTest.translate(e))
               end
             end
           ensure

data/lib/mocha/{integration → monkey_patching}/mini_test/version_140.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -23,12 +23,12 @@ module Mocha
               @passed = true
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue Exception => e
-                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e))
               end
             end
           ensure

data/lib/mocha/{integration → monkey_patching}/mini_test/version_141.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -31,14 +31,14 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                 raise
               rescue Exception => e
-                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e))
               end
               trap 'INFO', 'DEFAULT'
             end

data/lib/mocha/{integration → monkey_patching}/mini_test/version_142_to_172.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -31,14 +31,14 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                 raise
               rescue Exception => e
-                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e))
               end
               trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
             end

data/lib/mocha/{integration → monkey_patching}/mini_test/version_200.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -32,14 +32,14 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+              result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
             ensure
               begin
                 self.teardown
               rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                 raise
               rescue Exception => e
-                result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+                result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
               end
               trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
             end

data/lib/mocha/{integration → monkey_patching}/mini_test/version_201_to_222.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -32,14 +32,14 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+              result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
             ensure
               begin
                 self.teardown
               rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                 raise
               rescue Exception => e
-                result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+                result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
               end
               trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
             end

data/lib/mocha/{integration → monkey_patching}/mini_test/version_2110_to_2111.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -34,7 +34,7 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+              result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
             ensure
               %w{ before_teardown teardown after_teardown }.each do |hook|
                 begin
@@ -42,7 +42,7 @@ module Mocha
                 rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                   raise
                 rescue Exception => e
-                  result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+                  result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
                 end
               end
               trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL

data/lib/mocha/{integration → monkey_patching}/mini_test/version_2112_to_320.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -37,7 +37,7 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+              result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
             ensure
               %w{ before_teardown teardown after_teardown }.each do |hook|
                 begin
@@ -45,7 +45,7 @@ module Mocha
                 rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                   raise
                 rescue Exception => e
-                  result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+                  result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
                 end
               end
               trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL

data/lib/mocha/{integration → monkey_patching}/mini_test/version_230_to_2101.rb

@@ -1,9 +1,9 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/monkey_patching/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module MiniTest
 
@@ -33,7 +33,7 @@ module Mocha
               raise
             rescue Exception => e
               @passed = false
-              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+              result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
             ensure
               begin
                 self.run_teardown_hooks
@@ -41,7 +41,7 @@ module Mocha
               rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
                 raise
               rescue Exception => e
-                result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+                result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
               end
               trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
             end

data/lib/mocha/monkey_patching/mini_test/version_330.rb

@@ -0,0 +1,65 @@
+require 'mocha/monkey_patching/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+
+  module MonkeyPatching
+
+    module MiniTest
+
+      module Version330
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest v3.3.0" if $mocha_options['debug']
+        end
+        def run runner
+          trap "INFO" do
+            runner.report.each_with_index do |msg, i|
+              warn "\n%3d) %s" % [i + 1, msg]
+            end
+            warn ''
+            time = runner.start_time ? Time.now - runner.start_time : 0
+            warn "Current Test: %s#%s %.2fs" % [self.class, self.__name__, time]
+            runner.status $stderr
+          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+          assertion_counter = AssertionCounter.new(self)
+          result = ""
+          begin
+            begin
+              @passed = nil
+              self.before_setup
+              self.setup
+              self.after_setup
+              self.run_test self.__name__
+              mocha_verify(assertion_counter)
+              result = "." unless io?
+              @passed = true
+            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+              raise
+            rescue Exception => e
+              @passed = false
+              result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
+            ensure
+              %w{ before_teardown teardown after_teardown }.each do |hook|
+                begin
+                  self.send hook
+                rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+                  raise
+                rescue Exception => e
+                  @passed = false
+                  result = runner.puke self.class, self.__name__, Mocha::MonkeyPatching::MiniTest.translate(e)
+                end
+              end
+              trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mocha/{integration → monkey_patching}/test_unit.rb

@@ -3,12 +3,12 @@ require 'mocha/options'
 
 if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
 
-  require 'mocha/integration/test_unit/gem_version_200'
-  require 'mocha/integration/test_unit/gem_version_201_to_202'
-  require 'mocha/integration/test_unit/gem_version_203_to_220'
-  require 'mocha/integration/test_unit/gem_version_230_to_251'
-  require 'mocha/integration/test_unit/ruby_version_185_and_below'
-  require 'mocha/integration/test_unit/ruby_version_186_and_above'
+  require 'mocha/monkey_patching/test_unit/gem_version_200'
+  require 'mocha/monkey_patching/test_unit/gem_version_201_to_202'
+  require 'mocha/monkey_patching/test_unit/gem_version_203_to_220'
+  require 'mocha/monkey_patching/test_unit/gem_version_230_to_251'
+  require 'mocha/monkey_patching/test_unit/ruby_version_185_and_below'
+  require 'mocha/monkey_patching/test_unit/ruby_version_186_and_above'
 
   module Test
     module Unit
@@ -33,20 +33,20 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
 
         if (test_unit_version == Gem::Version.new('1.x')) || (test_unit_version == Gem::Version.new('1.2.3'))
           if RUBY_VERSION < '1.8.6'
-            include Mocha::Integration::TestUnit::RubyVersion185AndBelow
+            include Mocha::MonkeyPatching::TestUnit::RubyVersion185AndBelow
           else
-            include Mocha::Integration::TestUnit::RubyVersion186AndAbove
+            include Mocha::MonkeyPatching::TestUnit::RubyVersion186AndAbove
           end
         elsif Gem::Requirement.new('2.0.0').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion200
+          include Mocha::MonkeyPatching::TestUnit::GemVersion200
         elsif Gem::Requirement.new('>= 2.0.1', '<= 2.0.2').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion201To202
+          include Mocha::MonkeyPatching::TestUnit::GemVersion201To202
         elsif Gem::Requirement.new('>= 2.0.3', '<= 2.2.0').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion203To220
+          include Mocha::MonkeyPatching::TestUnit::GemVersion203To220
         elsif Gem::Requirement.new('>= 2.3.0', '<= 2.5.1').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion230To251
+          include Mocha::MonkeyPatching::TestUnit::GemVersion230To251
         else
-          $stderr.puts "*** No Mocha integration for Test::Unit version ***" if $mocha_options['debug']
+          $stderr.puts "*** No Mocha monkey-patch for Test::Unit version ***" if $mocha_options['debug']
         end
 
       end

data/lib/mocha/{integration → monkey_patching}/test_unit/assertion_counter.rb

@@ -1,6 +1,6 @@
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/{integration → monkey_patching}/test_unit/gem_version_200.rb

@@ -1,10 +1,10 @@
 require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/monkey_patching/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/{integration → monkey_patching}/test_unit/gem_version_201_to_202.rb

@@ -1,10 +1,10 @@
 require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/monkey_patching/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/{integration → monkey_patching}/test_unit/gem_version_203_to_220.rb

@@ -1,10 +1,10 @@
 require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/monkey_patching/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/{integration → monkey_patching}/test_unit/gem_version_230_to_251.rb

@@ -1,10 +1,10 @@
 require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/monkey_patching/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/{integration → monkey_patching}/test_unit/ruby_version_185_and_below.rb

@@ -1,10 +1,10 @@
 require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/monkey_patching/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/{integration → monkey_patching}/test_unit/ruby_version_186_and_above.rb

@@ -1,10 +1,10 @@
 require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/monkey_patching/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
 
-  module Integration
+  module MonkeyPatching
 
     module TestUnit
 

data/lib/mocha/object.rb

@@ -4,6 +4,7 @@ require 'mocha/class_method'
 require 'mocha/module_method'
 require 'mocha/any_instance_method'
 require 'mocha/argument_iterator'
+require 'mocha/expectation_error_factory'
 
 module Mocha
 
@@ -65,7 +66,7 @@ module Mocha
     # @see Mock#expects
     def expects(expected_methods_vs_return_values)
       if expected_methods_vs_return_values.to_s =~ /the[^a-z]*spanish[^a-z]*inquisition/i
-        raise Mocha::ExpectationError.new('NOBODY EXPECTS THE SPANISH INQUISITION!')
+        raise ExpectationErrorFactory.build('NOBODY EXPECTS THE SPANISH INQUISITION!')
       end
       if frozen?
         raise StubbingError.new("can't stub method on frozen object: #{mocha_inspect}", caller)

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/test/acceptance/minitest_test.rb

@@ -19,7 +19,7 @@ else
   if defined?(MiniTest)
 
     # monkey-patch MiniTest now that it has hopefully been loaded
-    require 'mocha/integration/mini_test'
+    require 'mocha/monkey_patching/mini_test'
 
     class MiniTestSampleTest < MiniTest::Unit::TestCase
 

data/test/test_runner.rb

@@ -1,7 +1,7 @@
 require 'test/unit/testcase'
 
 if defined?(MiniTest)
-  require 'mocha/integration/mini_test'
+  require 'mocha/monkey_patching/mini_test'
   require File.expand_path('../mini_test_result', __FILE__)
 else
   require File.expand_path('../test_unit_result', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
-  requirement: &70237796907960 !ruby/object:Gem::Requirement
+  requirement: &70321302911880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70237796907960
+  version_requirements: *70321302911880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70237796906640 !ruby/object:Gem::Requirement
+  requirement: &70321302910560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237796906640
+  version_requirements: *70321302910560
 - !ruby/object:Gem::Dependency
   name: introspection
-  requirement: &70237796906180 !ruby/object:Gem::Requirement
+  requirement: &70321302910100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70237796906180
+  version_requirements: *70321302910100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70237796905800 !ruby/object:Gem::Requirement
+  requirement: &70321302909720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237796905800
+  version_requirements: *70321302909720
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
@@ -104,37 +104,39 @@ files:
 - lib/mocha/exception_raiser.rb
 - lib/mocha/expectation.rb
 - lib/mocha/expectation_error.rb
+- lib/mocha/expectation_error_factory.rb
 - lib/mocha/expectation_list.rb
 - lib/mocha/in_state_ordering_constraint.rb
 - lib/mocha/inspect.rb
 - lib/mocha/instance_method.rb
-- lib/mocha/integration.rb
-- lib/mocha/integration/mini_test.rb
-- lib/mocha/integration/mini_test/assertion_counter.rb
-- lib/mocha/integration/mini_test/exception_translation.rb
-- lib/mocha/integration/mini_test/version_13.rb
-- lib/mocha/integration/mini_test/version_140.rb
-- lib/mocha/integration/mini_test/version_141.rb
-- lib/mocha/integration/mini_test/version_142_to_172.rb
-- lib/mocha/integration/mini_test/version_200.rb
-- lib/mocha/integration/mini_test/version_201_to_222.rb
-- lib/mocha/integration/mini_test/version_2110_to_2111.rb
-- lib/mocha/integration/mini_test/version_2112_to_320.rb
-- lib/mocha/integration/mini_test/version_230_to_2101.rb
-- lib/mocha/integration/test_unit.rb
-- lib/mocha/integration/test_unit/assertion_counter.rb
-- lib/mocha/integration/test_unit/gem_version_200.rb
-- lib/mocha/integration/test_unit/gem_version_201_to_202.rb
-- lib/mocha/integration/test_unit/gem_version_203_to_220.rb
-- lib/mocha/integration/test_unit/gem_version_230_to_251.rb
-- lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
-- lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/is_a.rb
 - lib/mocha/logger.rb
 - lib/mocha/method_matcher.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
 - lib/mocha/module_method.rb
+- lib/mocha/monkey_patching.rb
+- lib/mocha/monkey_patching/mini_test.rb
+- lib/mocha/monkey_patching/mini_test/assertion_counter.rb
+- lib/mocha/monkey_patching/mini_test/exception_translation.rb
+- lib/mocha/monkey_patching/mini_test/version_13.rb
+- lib/mocha/monkey_patching/mini_test/version_140.rb
+- lib/mocha/monkey_patching/mini_test/version_141.rb
+- lib/mocha/monkey_patching/mini_test/version_142_to_172.rb
+- lib/mocha/monkey_patching/mini_test/version_200.rb
+- lib/mocha/monkey_patching/mini_test/version_201_to_222.rb
+- lib/mocha/monkey_patching/mini_test/version_2110_to_2111.rb
+- lib/mocha/monkey_patching/mini_test/version_2112_to_320.rb
+- lib/mocha/monkey_patching/mini_test/version_230_to_2101.rb
+- lib/mocha/monkey_patching/mini_test/version_330.rb
+- lib/mocha/monkey_patching/test_unit.rb
+- lib/mocha/monkey_patching/test_unit/assertion_counter.rb
+- lib/mocha/monkey_patching/test_unit/gem_version_200.rb
+- lib/mocha/monkey_patching/test_unit/gem_version_201_to_202.rb
+- lib/mocha/monkey_patching/test_unit/gem_version_203_to_220.rb
+- lib/mocha/monkey_patching/test_unit/gem_version_230_to_251.rb
+- lib/mocha/monkey_patching/test_unit/ruby_version_185_and_below.rb
+- lib/mocha/monkey_patching/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/multiple_yields.rb
 - lib/mocha/names.rb
 - lib/mocha/no_yields.rb
@@ -309,7 +311,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 512632440970329998
+      hash: 378206207515710598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/mocha/integration/mini_test.rb

@@ -1,59 +0,0 @@
-require 'mocha/api'
-require 'mocha/options'
-
-if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
-
-  require 'mocha/integration/mini_test/exception_translation'
-  require 'mocha/integration/mini_test/version_13'
-  require 'mocha/integration/mini_test/version_140'
-  require 'mocha/integration/mini_test/version_141'
-  require 'mocha/integration/mini_test/version_142_to_172'
-  require 'mocha/integration/mini_test/version_200'
-  require 'mocha/integration/mini_test/version_201_to_222'
-  require 'mocha/integration/mini_test/version_230_to_2101'
-  require 'mocha/integration/mini_test/version_2110_to_2111'
-  require 'mocha/integration/mini_test/version_2112_to_320'
-
-  module MiniTest
-    class Unit
-      class TestCase
-
-        include Mocha::API
-
-        alias_method :run_before_mocha, :run
-        remove_method :run
-
-        mini_test_version = begin
-          Gem::Version.new(MiniTest::Unit::VERSION)
-        rescue LoadError
-          Gem::Version.new('0.0.0')
-        end
-
-        $stderr.puts "Detected MiniTest version: #{mini_test_version}" if $mocha_options['debug']
-
-        if Gem::Requirement.new('>= 1.3.0', '<= 1.3.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version13
-        elsif Gem::Requirement.new('1.4.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version140
-        elsif Gem::Requirement.new('1.4.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version141
-        elsif Gem::Requirement.new('>= 1.4.2', '<= 1.7.2').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version142To172
-        elsif Gem::Requirement.new('2.0.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version200
-        elsif Gem::Requirement.new('>= 2.0.1', '<= 2.2.2').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version201To222
-        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.10.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version230To2101
-        elsif Gem::Requirement.new('>= 2.11.0', '<= 2.11.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version2110To2111
-        elsif Gem::Requirement.new('>= 2.11.2', '<= 3.2.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version2112To320
-        else
-          $stderr.puts "*** No Mocha integration for MiniTest version ***" if $mocha_options['debug']
-        end
-
-      end
-    end
-  end
-end