RubyGems - mocha - Versions diffs - 0.12.10 → 0.13.0 - Mend

mocha 0.12.10 → 0.13.0

Files changed (134) hide show

data/.yardopts +22 -0
data/COPYING.md +3 -0
data/{MIT-LICENSE.rdoc → MIT-LICENSE.md} +0 -0
data/README.md +230 -0
data/{RELEASE.rdoc → RELEASE.md} +61 -56
data/Rakefile +45 -37
data/build-matrix.rb +16 -4
data/lib/mocha.rb +6 -2
data/lib/mocha/api.rb +13 -16
data/lib/mocha/class_method.rb +7 -3
data/lib/mocha/class_methods.rb +63 -0
data/lib/mocha/debug.rb +11 -0
data/lib/mocha/deprecation.rb +1 -1
data/lib/mocha/exception_raiser.rb +1 -1
data/lib/mocha/expectation_error.rb +5 -0
data/lib/mocha/expectation_error_factory.rb +19 -0
data/lib/mocha/hooks.rb +43 -0
data/lib/mocha/integration.rb +6 -38
data/lib/mocha/integration/assertion_counter.rb +13 -0
data/lib/mocha/integration/mini_test.rb +42 -60
data/lib/mocha/integration/mini_test/adapter.rb +54 -0
data/lib/mocha/integration/mini_test/exception_translation.rb +0 -6
data/lib/mocha/integration/mini_test/nothing.rb +19 -0
data/lib/mocha/integration/mini_test/version_13.rb +32 -25
data/lib/mocha/integration/mini_test/version_140.rb +32 -26
data/lib/mocha/integration/mini_test/version_141.rb +40 -34
data/lib/mocha/integration/mini_test/version_142_to_172.rb +40 -34
data/lib/mocha/integration/mini_test/version_200.rb +41 -35
data/lib/mocha/integration/mini_test/version_201_to_222.rb +41 -35
data/lib/mocha/integration/mini_test/version_2110_to_2111.rb +49 -43
data/lib/mocha/integration/mini_test/version_2112_to_320.rb +53 -47
data/lib/mocha/integration/mini_test/version_230_to_2101.rb +43 -37
data/lib/mocha/integration/monkey_patcher.rb +18 -0
data/lib/mocha/integration/test_unit.rb +38 -45
data/lib/mocha/integration/test_unit/adapter.rb +51 -0
data/lib/mocha/integration/test_unit/gem_version_200.rb +36 -29
data/lib/mocha/integration/test_unit/gem_version_201_to_202.rb +36 -29
data/lib/mocha/integration/test_unit/gem_version_203_to_220.rb +36 -29
data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb +65 -0
data/lib/mocha/integration/test_unit/nothing.rb +19 -0
data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb +36 -29
data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb +37 -30
data/lib/mocha/method_matcher.rb +1 -1
data/lib/mocha/module_methods.rb +14 -0
data/lib/mocha/{object.rb → object_methods.rb} +0 -83
data/lib/mocha/setup.rb +10 -0
data/lib/mocha/standalone.rb +3 -0
data/lib/mocha/version.rb +1 -1
data/lib/mocha_standalone.rb +3 -1
data/mocha.gemspec +16 -9
data/test/acceptance/bug_18914_test.rb +1 -1
data/test/acceptance/bug_21465_test.rb +1 -1
data/test/acceptance/bug_21563_test.rb +1 -1
data/test/acceptance/exception_rescue_test.rb +1 -1
data/test/acceptance/expectations_on_multiple_methods_test.rb +1 -1
data/test/acceptance/expected_invocation_count_test.rb +1 -1
data/test/acceptance/failure_messages_test.rb +1 -1
data/test/acceptance/issue_65_test.rb +1 -1
data/test/acceptance/issue_70_test.rb +1 -1
data/test/acceptance/mocha_example_test.rb +1 -1
data/test/acceptance/mocha_test_result_test.rb +1 -1
data/test/acceptance/mock_test.rb +1 -1
data/test/acceptance/mock_with_initializer_block_test.rb +1 -1
data/test/acceptance/mocked_methods_dispatch_test.rb +1 -1
data/test/acceptance/multiple_expectations_failure_message_test.rb +1 -1
data/test/acceptance/optional_parameters_test.rb +1 -1
data/test/acceptance/parameter_matcher_test.rb +1 -1
data/test/acceptance/partial_mocks_test.rb +1 -1
data/test/acceptance/raise_exception_test.rb +1 -1
data/test/acceptance/return_value_test.rb +1 -1
data/test/acceptance/sequence_test.rb +1 -1
data/test/acceptance/states_test.rb +1 -1
data/test/acceptance/stub_any_instance_method_test.rb +1 -1
data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +1 -1
data/test/acceptance/stub_class_method_defined_on_class_test.rb +1 -1
data/test/acceptance/stub_class_method_defined_on_module_test.rb +1 -1
data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +1 -1
data/test/acceptance/stub_everything_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_class_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_module_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +1 -1
data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +1 -1
data/test/acceptance/stub_module_method_test.rb +1 -1
data/test/acceptance/stub_test.rb +1 -1
data/test/acceptance/stubba_example_test.rb +1 -1
data/test/acceptance/stubba_test_result_test.rb +1 -1
data/test/acceptance/stubbing_error_backtrace_test.rb +1 -1
data/test/acceptance/stubbing_frozen_object_test.rb +1 -1
data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +1 -1
data/test/acceptance/stubbing_method_unnecessarily_test.rb +1 -1
data/test/acceptance/stubbing_nil_test.rb +1 -1
data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +1 -1
data/test/acceptance/stubbing_non_existent_class_method_test.rb +1 -1
data/test/acceptance/stubbing_non_existent_instance_method_test.rb +1 -1
data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +1 -1
data/test/acceptance/stubbing_non_public_class_method_test.rb +1 -1
data/test/acceptance/stubbing_non_public_instance_method_test.rb +1 -1
data/test/acceptance/stubbing_on_non_mock_object_test.rb +1 -1
data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +3 -3
data/test/acceptance/throw_test.rb +1 -1
data/test/acceptance/unstubbing_test.rb +1 -1
data/test/integration/mini_test_test.rb +9 -0
data/test/integration/shared_tests.rb +174 -0
data/test/integration/test_unit_test.rb +9 -0
data/test/mini_test_result.rb +0 -1
data/test/test_runner.rb +14 -14
data/test/unit/class_methods_test.rb +40 -0
data/test/unit/method_matcher_test.rb +5 -0
data/test/unit/mock_test.rb +6 -0
data/test/unit/module_methods_test.rb +19 -0
data/test/unit/object_methods_test.rb +45 -0
metadata +45 -74
data/COPYING.rdoc +0 -3
data/README.rdoc +0 -56
data/examples/misc.rb +0 -43
data/examples/mocha.rb +0 -25
data/examples/stubba.rb +0 -64
data/gemfiles/Gemfile.minitest.3.3.0 +0 -7
data/gemfiles/Gemfile.minitest.4.2.0 +0 -7
data/lib/mocha/integration/mini_test/assertion_counter.rb +0 -23
data/lib/mocha/integration/mini_test/version_330_to_410.rb +0 -65
data/lib/mocha/integration/mini_test/version_420_to_433.rb +0 -70
data/lib/mocha/integration/mini_test/version_440.rb +0 -70
data/lib/mocha/integration/mini_test/version_450_to_461.rb +0 -72
data/lib/mocha/integration/test_unit/assertion_counter.rb +0 -23
data/lib/mocha/integration/test_unit/gem_version_230_to_254.rb +0 -58
data/lib/mocha/options.rb +0 -1
data/test/acceptance/api_test.rb +0 -139
data/test/acceptance/minitest_test.rb +0 -162
data/test/unit/object_test.rb +0 -92

data/test/acceptance/bug_18914_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class Bug18914Test < Test::Unit::TestCase

data/test/acceptance/bug_21465_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class Bug21465Test < Test::Unit::TestCase

data/test/acceptance/bug_21563_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class Bug21563Test < Test::Unit::TestCase

data/test/acceptance/exception_rescue_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class ExceptionRescueTest < Test::Unit::TestCase

data/test/acceptance/expectations_on_multiple_methods_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class ExpectationsOnMultipleMethodsTest < Test::Unit::TestCase

data/test/acceptance/expected_invocation_count_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class ExpectedInvocationCountTest < Test::Unit::TestCase

data/test/acceptance/failure_messages_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class FailureMessagesTest < Test::Unit::TestCase

data/test/acceptance/issue_65_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class Issue65Test < Test::Unit::TestCase

data/test/acceptance/issue_70_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class Issue70Test < Test::Unit::TestCase

data/test/acceptance/mocha_example_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class MochaExampleTest < Test::Unit::TestCase

data/test/acceptance/mocha_test_result_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 class MochaTestResultTest < Test::Unit::TestCase

data/test/acceptance/mock_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class MockTest < Test::Unit::TestCase

data/test/acceptance/mock_with_initializer_block_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class MockWithInitializerBlockTest < Test::Unit::TestCase

data/test/acceptance/mocked_methods_dispatch_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class MockedMethodDispatchTest < Test::Unit::TestCase

data/test/acceptance/multiple_expectations_failure_message_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class FailureMessageTest < Test::Unit::TestCase

data/test/acceptance/optional_parameters_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class OptionalParameterMatcherTest < Test::Unit::TestCase

data/test/acceptance/parameter_matcher_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class ParameterMatcherTest < Test::Unit::TestCase

data/test/acceptance/partial_mocks_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class PartialMockTest < Test::Unit::TestCase

data/test/acceptance/raise_exception_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class RaiseExceptionTest < Test::Unit::TestCase

data/test/acceptance/return_value_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class ReturnValueTest < Test::Unit::TestCase

data/test/acceptance/sequence_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class SequenceTest < Test::Unit::TestCase

data/test/acceptance/states_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StatesTest < Test::Unit::TestCase

data/test/acceptance/stub_any_instance_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubAnyInstanceMethodTest < Test::Unit::TestCase

data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Test::Unit::TestCase

data/test/acceptance/stub_class_method_defined_on_class_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubClassMethodDefinedOnClassTest < Test::Unit::TestCase

data/test/acceptance/stub_class_method_defined_on_module_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubClassMethodDefinedOnModuleTest < Test::Unit::TestCase

data/test/acceptance/stub_class_method_defined_on_superclass_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubClassMethodDefinedOnSuperclassTest < Test::Unit::TestCase

data/test/acceptance/stub_everything_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubEverythingTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnClassAndAliasedTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_class_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnClassTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnKernelModuleTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_module_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnModuleTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnObjectClassTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnSingletonClassTest < Test::Unit::TestCase

data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubInstanceMethodDefinedOnSuperclassTest < Test::Unit::TestCase

data/test/acceptance/stub_module_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubModuleMethodTest < Test::Unit::TestCase

data/test/acceptance/stub_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubTest < Test::Unit::TestCase

data/test/acceptance/stubba_example_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class Widget

data/test/acceptance/stubba_test_result_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 class StubbaTestResultTest < Test::Unit::TestCase

data/test/acceptance/stubbing_error_backtrace_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 class StubbingErrorBacktraceTest < Test::Unit::TestCase

data/test/acceptance/stubbing_frozen_object_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 class StubbingFrozenObjectTest < Test::Unit::TestCase

data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingMethodAcceptingBlockParameterTest < Test::Unit::TestCase

data/test/acceptance/stubbing_method_unnecessarily_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingMethodUnnecessarilyTest < Test::Unit::TestCase

data/test/acceptance/stubbing_nil_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNilTest < Test::Unit::TestCase

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNonExistentAnyInstanceMethodTest < Test::Unit::TestCase

data/test/acceptance/stubbing_non_existent_class_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNonExistentClassMethodTest < Test::Unit::TestCase

data/test/acceptance/stubbing_non_existent_instance_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase

data/test/acceptance/stubbing_non_public_any_instance_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase

data/test/acceptance/stubbing_non_public_class_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNonPublicClassMethodTest < Test::Unit::TestCase

data/test/acceptance/stubbing_non_public_instance_method_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase

data/test/acceptance/stubbing_on_non_mock_object_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingOnNonMockObjectTest < Test::Unit::TestCase

data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class StubbingSameClassMethodOnParentAndChildClassTest < Test::Unit::TestCase
@@ -21,11 +21,11 @@ class StubbingSameClassMethodOnParentAndChildClassTest < Test::Unit::TestCase
     end
     child_class = Class.new(parent_class)
     test_result = run_as_tests(
-      lambda {
+      :test_1 => lambda {
         parent_class.stubs(:foo).returns("stubbed Parent.foo")
         child_class.stubs(:foo).returns("stubbed Child.foo")
       },
-      lambda {
+      :test_2 => lambda {
         parent_class.foo
         child_class.foo
       }

data/test/acceptance/throw_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class ThrowTest < Test::Unit::TestCase

data/test/acceptance/unstubbing_test.rb CHANGED

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 class UnstubbingTest < Test::Unit::TestCase