RubyGems - mocha - Versions diffs - 0.9.5 → 0.9.6 - Mend

mocha 0.9.5 → 0.9.6

Files changed (61) hide show

data/RELEASE +17 -2
data/Rakefile +10 -7
data/examples/misc.rb +0 -1
data/examples/mocha.rb +0 -1
data/examples/stubba.rb +0 -1
data/lib/mocha.rb +1 -47
data/lib/mocha/any_instance_method.rb +5 -1
data/lib/mocha/{standalone.rb → api.rb} +8 -1
data/lib/mocha/class_method.rb +5 -1
data/lib/mocha/expectation.rb +3 -3
data/lib/mocha/integration.rb +38 -0
data/lib/mocha/integration/mini_test.rb +21 -0
data/lib/mocha/integration/mini_test/assertion_counter.rb +23 -0
data/lib/mocha/integration/mini_test/version_131_and_above.rb +50 -0
data/lib/mocha/integration/test_unit.rb +40 -0
data/lib/mocha/integration/test_unit/assertion_counter.rb +23 -0
data/lib/mocha/integration/test_unit/gem_version_200.rb +49 -0
data/lib/mocha/integration/test_unit/gem_version_201_and_above.rb +49 -0
data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb +48 -0
data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb +50 -0
data/lib/mocha/parameter_matchers/has_entry.rb +1 -0
data/lib/mocha_standalone.rb +2 -2
data/test/acceptance/{standalone_test.rb → api_test.rb} +2 -2
data/test/acceptance/bug_21465_test.rb +2 -2
data/test/acceptance/bug_21563_test.rb +1 -1
data/test/acceptance/expected_invocation_count_test.rb +19 -19
data/test/acceptance/failure_messages_test.rb +6 -6
data/test/acceptance/minitest_test.rb +32 -9
data/test/acceptance/mocha_test_result_test.rb +8 -8
data/test/acceptance/mock_test.rb +10 -10
data/test/acceptance/mock_with_initializer_block_test.rb +3 -3
data/test/acceptance/mocked_methods_dispatch_test.rb +5 -5
data/test/acceptance/optional_parameters_test.rb +6 -6
data/test/acceptance/parameter_matcher_test.rb +20 -20
data/test/acceptance/partial_mocks_test.rb +2 -2
data/test/acceptance/return_value_test.rb +4 -4
data/test/acceptance/sequence_test.rb +11 -11
data/test/acceptance/states_test.rb +4 -4
data/test/acceptance/stub_any_instance_method_test.rb +12 -12
data/test/acceptance/stub_class_method_test.rb +12 -12
data/test/acceptance/stub_everything_test.rb +4 -4
data/test/acceptance/stub_instance_method_test.rb +13 -13
data/test/acceptance/stub_module_method_test.rb +12 -12
data/test/acceptance/stub_test.rb +4 -4
data/test/acceptance/stubba_test.rb +1 -1
data/test/acceptance/stubba_test_result_test.rb +6 -6
data/test/acceptance/stubbing_error_backtrace_test.rb +4 -4
data/test/acceptance/stubbing_method_unnecessarily_test.rb +5 -5
data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +10 -10
data/test/acceptance/stubbing_non_existent_class_method_test.rb +11 -11
data/test/acceptance/stubbing_non_existent_instance_method_test.rb +11 -11
data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +9 -9
data/test/acceptance/stubbing_non_public_class_method_test.rb +10 -10
data/test/acceptance/stubbing_non_public_instance_method_test.rb +10 -10
data/test/acceptance/stubbing_on_non_mock_object_test.rb +5 -5
data/test/test_helper.rb +4 -0
data/test/test_runner.rb +1 -1
data/test/unit/parameter_matchers/has_entry_test.rb +20 -0
metadata +14 -6
data/lib/mocha/mini_test_adapter.rb +0 -50
data/lib/mocha/test_case_adapter.rb +0 -103

data/lib/mocha/mini_test_adapter.rb DELETED

@@ -1,50 +0,0 @@
-module Mocha
-  module MiniTestCaseAdapter
-    class AssertionCounter
-      def initialize(test_case)
-        @test_case = test_case
-      end
-      def increment
-        @test_case._assertions += 1
-      end
-    end
-    def self.included(base)
-      base.class_eval do
-        alias_method :run_before_mocha_mini_test_adapter, :run
-        def run runner
-          assertion_counter = AssertionCounter.new(self)
-          result = '.'
-          begin
-            begin
-              @passed = nil
-              self.setup
-              self.__send__ self.name
-              mocha_verify(assertion_counter)
-              @passed = true
-            rescue Exception => e
-              @passed = false
-              result = runner.puke(self.class, self.name, e)
-            ensure
-              begin
-                self.teardown
-              rescue Exception => e
-                result = runner.puke(self.class, self.name, e)
-              end
-            end
-          ensure
-            mocha_teardown
-          end
-          result
-        end
-      end
-    end
-  end
-end

data/lib/mocha/test_case_adapter.rb DELETED

@@ -1,103 +0,0 @@
-require 'mocha/expectation_error'
-module Mocha
-  module TestCaseAdapter
-    class AssertionCounter
-      def initialize(test_result)
-        @test_result = test_result
-      end
-      def increment
-        @test_result.add_assertion
-      end
-    end
-    def self.included(base)
-      if RUBY_VERSION < '1.8.6'
-        base.class_eval do
-          alias_method :run_before_mocha_test_case_adapter, :run
-          def run(result)
-            assertion_counter = AssertionCounter.new(result)
-            yield(Test::Unit::TestCase::STARTED, name)
-            @_result = result
-            begin
-              begin
-                setup
-                __send__(@method_name)
-                mocha_verify(assertion_counter)
-              rescue Mocha::ExpectationError => e
-                add_failure(e.message, e.backtrace)
-              rescue Test::Unit::AssertionFailedError => e
-                add_failure(e.message, e.backtrace)
-              rescue StandardError, ScriptError
-                add_error($!)
-              ensure
-                begin
-                  teardown
-                rescue Test::Unit::AssertionFailedError => e
-                  add_failure(e.message, e.backtrace)
-                rescue StandardError, ScriptError
-                  add_error($!)
-                end
-              end
-            ensure
-              mocha_teardown
-            end
-            result.add_run
-            yield(Test::Unit::TestCase::FINISHED, name)
-          end
-        end
-      else
-        base.class_eval do
-          alias_method :run_before_mocha_test_case_adapter, :run
-          def run(result)
-            assertion_counter = AssertionCounter.new(result)
-            yield(Test::Unit::TestCase::STARTED, name)
-            @_result = result
-            begin
-              begin
-                setup
-                __send__(@method_name)
-                mocha_verify(assertion_counter)
-              rescue Mocha::ExpectationError => e
-                add_failure(e.message, e.backtrace)
-              rescue Test::Unit::AssertionFailedError => e
-                add_failure(e.message, e.backtrace)
-              rescue Exception
-                raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
-                add_error($!)
-              ensure
-                begin
-                  teardown
-                rescue Test::Unit::AssertionFailedError => e
-                  add_failure(e.message, e.backtrace)
-                rescue Exception
-                  raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
-                  add_error($!)
-                end
-              end
-            ensure
-              mocha_teardown
-            end
-            result.add_run
-            yield(Test::Unit::TestCase::FINISHED, name)
-          end
-        end
-      end
-    end
-  end
-end