RubyGems - mocha - Versions diffs - 1.6.0 → 1.10.1 - Mend

mocha 1.6.0 → 1.10.1

Files changed (310) hide show

checksums.yaml +5 -5
data/.rubocop.yml +61 -0
data/.rubocop_todo.yml +27 -0
data/CONTRIBUTING.md +4 -9
data/README.md +55 -27
data/RELEASE.md +90 -0
data/Rakefile +44 -38
data/bin/build-matrix +32 -20
data/docs/CNAME +1 -0
data/docs/Mocha.html +254 -0
data/docs/Mocha/API.html +1153 -0
data/docs/Mocha/ClassMethods.html +264 -0
data/docs/Mocha/Configuration.html +1383 -0
data/docs/Mocha/Expectation.html +2654 -0
data/docs/Mocha/ExpectationError.html +152 -0
data/docs/Mocha/ExpectationErrorFactory.html +260 -0
data/docs/Mocha/Hooks.html +370 -0
data/docs/Mocha/Integration.html +125 -0
data/docs/Mocha/Integration/MiniTest.html +123 -0
data/docs/Mocha/Integration/MiniTest/Adapter.html +164 -0
data/docs/Mocha/Integration/TestUnit.html +123 -0
data/docs/Mocha/Integration/TestUnit/Adapter.html +164 -0
data/docs/Mocha/Mock.html +1237 -0
data/docs/Mocha/ObjectMethods.html +765 -0
data/docs/Mocha/ParameterMatchers.html +2961 -0
data/docs/Mocha/ParameterMatchers/AllOf.html +153 -0
data/docs/Mocha/ParameterMatchers/AnyOf.html +153 -0
data/docs/Mocha/ParameterMatchers/AnyParameters.html +153 -0
data/docs/Mocha/ParameterMatchers/Anything.html +153 -0
data/docs/Mocha/ParameterMatchers/Base.html +441 -0
data/docs/Mocha/ParameterMatchers/Equals.html +153 -0
data/docs/Mocha/ParameterMatchers/EquivalentUri.html +153 -0
data/docs/Mocha/ParameterMatchers/HasEntries.html +153 -0
data/docs/Mocha/ParameterMatchers/HasEntry.html +153 -0
data/docs/Mocha/ParameterMatchers/HasKey.html +153 -0
data/docs/Mocha/ParameterMatchers/HasValue.html +153 -0
data/docs/Mocha/ParameterMatchers/Includes.html +153 -0
data/docs/Mocha/ParameterMatchers/InstanceOf.html +153 -0
data/docs/Mocha/ParameterMatchers/IsA.html +153 -0
data/docs/Mocha/ParameterMatchers/KindOf.html +153 -0
data/docs/Mocha/ParameterMatchers/Not.html +153 -0
data/docs/Mocha/ParameterMatchers/Optionally.html +153 -0
data/docs/Mocha/ParameterMatchers/RegexpMatches.html +153 -0
data/docs/Mocha/ParameterMatchers/RespondsWith.html +153 -0
data/docs/Mocha/ParameterMatchers/YamlEquivalent.html +153 -0
data/docs/Mocha/Sequence.html +149 -0
data/docs/Mocha/StateMachine.html +527 -0
data/docs/Mocha/StateMachine/State.html +140 -0
data/docs/Mocha/StateMachine/StatePredicate.html +140 -0
data/docs/Mocha/StubbingError.html +150 -0
data/docs/_index.html +519 -0
data/docs/class_list.html +51 -0
data/docs/css/common.css +1 -0
data/docs/css/full_list.css +58 -0
data/docs/css/style.css +496 -0
data/docs/file.COPYING.html +81 -0
data/docs/file.MIT-LICENSE.html +85 -0
data/docs/file.README.html +448 -0
data/docs/file.RELEASE.html +963 -0
data/docs/file_list.html +71 -0
data/docs/frames.html +17 -0
data/docs/index.html +448 -0
data/docs/js/app.js +303 -0
data/docs/js/full_list.js +216 -0
data/docs/js/jquery.js +4 -0
data/docs/method_list.html +627 -0
data/docs/top-level-namespace.html +118 -0
data/gemfiles/Gemfile.minitest.5.11.3 +7 -0
data/init.rb +1 -3
data/lib/mocha.rb +8 -0
data/lib/mocha/any_instance_method.rb +11 -59
data/lib/mocha/api.rb +70 -70
data/lib/mocha/argument_iterator.rb +4 -8
data/lib/mocha/backtrace_filter.rb +1 -5
data/lib/mocha/cardinality.rb +43 -35
data/lib/mocha/central.rb +7 -15
data/lib/mocha/change_state_side_effect.rb +0 -4
data/lib/mocha/class_methods.rb +13 -19
data/lib/mocha/configuration.rb +296 -74
data/lib/mocha/debug.rb +3 -2
data/lib/mocha/deprecation.rb +4 -11
data/lib/mocha/detection/mini_test.rb +0 -2
data/lib/mocha/detection/test_unit.rb +3 -5
data/lib/mocha/error_with_filtered_backtrace.rb +0 -4
data/lib/mocha/exception_raiser.rb +4 -6
data/lib/mocha/expectation.rb +62 -67
data/lib/mocha/expectation_error.rb +1 -1
data/lib/mocha/expectation_error_factory.rb +0 -1
data/lib/mocha/expectation_list.rb +7 -11
data/lib/mocha/hooks.rb +0 -1
data/lib/mocha/in_state_ordering_constraint.rb +0 -4
data/lib/mocha/inspect.rb +28 -28
data/lib/mocha/instance_method.rb +18 -3
data/lib/mocha/integration.rb +2 -5
data/lib/mocha/integration/mini_test.rb +7 -0
data/lib/mocha/integration/mini_test/adapter.rb +2 -4
data/lib/mocha/integration/mini_test/exception_translation.rb +1 -1
data/lib/mocha/integration/mini_test/nothing.rb +4 -4
data/lib/mocha/integration/mini_test/version_13.rb +3 -1
data/lib/mocha/integration/mini_test/version_140.rb +3 -1
data/lib/mocha/integration/mini_test/version_141.rb +3 -1
data/lib/mocha/integration/mini_test/version_142_to_172.rb +3 -1
data/lib/mocha/integration/mini_test/version_200.rb +3 -1
data/lib/mocha/integration/mini_test/version_201_to_222.rb +3 -1
data/lib/mocha/integration/mini_test/version_2110_to_2111.rb +3 -1
data/lib/mocha/integration/mini_test/version_2112_to_320.rb +3 -1
data/lib/mocha/integration/mini_test/version_230_to_2101.rb +3 -1
data/lib/mocha/integration/monkey_patcher.rb +5 -7
data/lib/mocha/integration/test_unit.rb +7 -0
data/lib/mocha/integration/test_unit/adapter.rb +5 -6
data/lib/mocha/integration/test_unit/gem_version_200.rb +4 -2
data/lib/mocha/integration/test_unit/gem_version_201_to_202.rb +4 -2
data/lib/mocha/integration/test_unit/gem_version_203_to_220.rb +4 -2
data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb +4 -2
data/lib/mocha/integration/test_unit/nothing.rb +4 -4
data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb +3 -1
data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb +3 -1
data/lib/mocha/invocation.rb +61 -0
data/lib/mocha/is_a.rb +0 -2
data/lib/mocha/logger.rb +0 -4
data/lib/mocha/macos_version.rb +5 -0
data/lib/mocha/method_matcher.rb +1 -5
data/lib/mocha/minitest.rb +7 -2
data/lib/mocha/mock.rb +57 -47
data/lib/mocha/mockery.rb +38 -90
data/lib/mocha/multiple_yields.rb +0 -5
data/lib/mocha/names.rb +2 -12
data/lib/mocha/no_yields.rb +1 -7
data/lib/mocha/not_initialized_error.rb +0 -2
data/lib/mocha/object_methods.rb +19 -29
data/lib/mocha/parameter_matchers.rb +1 -3
data/lib/mocha/parameter_matchers/all_of.rb +2 -8
data/lib/mocha/parameter_matchers/any_of.rb +2 -8
data/lib/mocha/parameter_matchers/any_parameters.rb +3 -9
data/lib/mocha/parameter_matchers/anything.rb +2 -8
data/lib/mocha/parameter_matchers/base.rb +6 -12
data/lib/mocha/parameter_matchers/equals.rb +0 -6
data/lib/mocha/parameter_matchers/equivalent_uri.rb +3 -12
data/lib/mocha/parameter_matchers/has_entries.rb +2 -6
data/lib/mocha/parameter_matchers/has_entry.rb +8 -11
data/lib/mocha/parameter_matchers/has_key.rb +2 -6
data/lib/mocha/parameter_matchers/has_value.rb +2 -6
data/lib/mocha/parameter_matchers/includes.rb +4 -6
data/lib/mocha/parameter_matchers/instance_methods.rb +18 -0
data/lib/mocha/parameter_matchers/instance_of.rb +0 -6
data/lib/mocha/parameter_matchers/is_a.rb +2 -6
data/lib/mocha/parameter_matchers/kind_of.rb +2 -6
data/lib/mocha/parameter_matchers/not.rb +2 -6
data/lib/mocha/parameter_matchers/optionally.rb +4 -10
data/lib/mocha/parameter_matchers/regexp_matches.rb +0 -6
data/lib/mocha/parameter_matchers/responds_with.rb +3 -8
data/lib/mocha/parameter_matchers/yaml_equivalent.rb +2 -6
data/lib/mocha/parameters_matcher.rb +6 -9
data/lib/mocha/pretty_parameters.rb +0 -4
data/lib/mocha/raised_exception.rb +11 -0
data/lib/mocha/receivers.rb +6 -12
data/lib/mocha/return_values.rb +4 -8
data/lib/mocha/sequence.rb +4 -9
data/lib/mocha/setup.rb +5 -0
data/lib/mocha/single_return_value.rb +2 -5
data/lib/mocha/single_yield.rb +0 -5
data/lib/mocha/singleton_class.rb +9 -0
data/lib/mocha/state_machine.rb +6 -10
data/lib/mocha/stubbed_method.rb +127 -0
data/lib/mocha/stubbing_error.rb +0 -2
data/lib/mocha/test_unit.rb +7 -2
data/lib/mocha/thrower.rb +4 -6
data/lib/mocha/thrown_object.rb +12 -0
data/lib/mocha/version.rb +1 -1
data/lib/mocha/yield_parameters.rb +3 -7
data/mocha.gemspec +33 -60
data/test/acceptance/acceptance_test_helper.rb +6 -4
data/test/acceptance/bug_18914_test.rb +7 -13
data/test/acceptance/bug_21465_test.rb +0 -3
data/test/acceptance/bug_21563_test.rb +0 -3
data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb +69 -0
data/test/acceptance/exception_rescue_test.rb +7 -9
data/test/acceptance/expectations_on_multiple_methods_test.rb +2 -2
data/test/acceptance/expected_invocation_count_test.rb +27 -30
data/test/acceptance/failure_messages_test.rb +3 -6
data/test/acceptance/issue_272_test.rb +1 -3
data/test/acceptance/issue_65_test.rb +15 -14
data/test/acceptance/issue_70_test.rb +0 -2
data/test/acceptance/mocha_example_test.rb +5 -7
data/test/acceptance/mocha_test_result_test.rb +7 -8
data/test/acceptance/mock_test.rb +48 -9
data/test/acceptance/mocked_methods_dispatch_test.rb +0 -3
data/test/acceptance/multiple_expectations_failure_message_test.rb +16 -18
data/test/acceptance/optional_parameters_test.rb +0 -3
data/test/acceptance/parameter_matcher_test.rb +2 -4
data/test/acceptance/partial_mocks_test.rb +4 -7
data/test/acceptance/prepend_test.rb +14 -17
data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb +0 -3
data/test/acceptance/raise_exception_test.rb +2 -5
data/test/acceptance/return_value_test.rb +0 -3
data/test/acceptance/sequence_test.rb +9 -12
data/test/acceptance/states_test.rb +6 -5
data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb +5 -5
data/test/acceptance/stub_any_instance_method_test.rb +39 -18
data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +8 -9
data/test/acceptance/stub_class_method_defined_on_class_test.rb +2 -2
data/test/acceptance/stub_class_method_defined_on_module_test.rb +0 -2
data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +7 -5
data/test/acceptance/stub_everything_test.rb +1 -4
data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +6 -8
data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_class_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_module_test.rb +0 -2
data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +2 -2
data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +0 -3
data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +0 -2
data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb +0 -1
data/test/acceptance/stub_module_method_test.rb +13 -14
data/test/acceptance/stub_test.rb +1 -4
data/test/acceptance/stubba_example_test.rb +6 -15
data/test/acceptance/stubba_test_result_test.rb +5 -9
data/test/acceptance/stubbing_error_backtrace_test.rb +6 -7
data/test/acceptance/stubbing_frozen_object_test.rb +2 -2
data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +12 -8
data/test/acceptance/stubbing_method_unnecessarily_test.rb +5 -7
data/test/acceptance/stubbing_nil_test.rb +9 -10
data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +28 -14
data/test/acceptance/stubbing_non_existent_class_method_test.rb +14 -14
data/test/acceptance/stubbing_non_existent_instance_method_test.rb +12 -14
data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +8 -10
data/test/acceptance/stubbing_non_public_class_method_test.rb +12 -12
data/test/acceptance/stubbing_non_public_instance_method_test.rb +10 -12
data/test/acceptance/stubbing_on_non_mock_object_test.rb +9 -15
data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +3 -5
data/test/acceptance/throw_test.rb +0 -3
data/test/acceptance/unexpected_invocation_test.rb +2 -4
data/test/acceptance/unstubbing_test.rb +41 -15
data/test/deprecation_disabler.rb +0 -1
data/test/execution_point.rb +2 -4
data/test/integration/mini_test_test.rb +2 -2
data/test/integration/shared_tests.rb +27 -23
data/test/integration/test_unit_test.rb +2 -2
data/test/method_definer.rb +11 -19
data/test/mini_test_result.rb +17 -11
data/test/minitest_result.rb +0 -1
data/test/simple_counter.rb +0 -2
data/test/test_helper.rb +13 -5
data/test/test_runner.rb +4 -4
data/test/test_unit_result.rb +4 -2
data/test/unit/any_instance_method_test.rb +74 -35
data/test/unit/array_inspect_test.rb +2 -4
data/test/unit/backtrace_filter_test.rb +3 -5
data/test/unit/cardinality_test.rb +41 -25
data/test/unit/central_test.rb +26 -28
data/test/unit/change_state_side_effect_test.rb +0 -4
data/test/unit/class_methods_test.rb +10 -12
data/test/unit/configuration_test.rb +13 -14
data/test/unit/date_time_inspect_test.rb +1 -3
data/test/unit/exception_raiser_test.rb +10 -7
data/test/unit/expectation_list_test.rb +13 -13
data/test/unit/expectation_test.rb +110 -130
data/test/unit/hash_inspect_test.rb +3 -5
data/test/unit/hooks_test.rb +9 -4
data/test/unit/in_state_ordering_constraint_test.rb +0 -4
data/test/unit/instance_method_test.rb +282 -0
data/test/unit/method_matcher_test.rb +1 -3
data/test/unit/mock_test.rb +47 -25
data/test/unit/mockery_test.rb +32 -33
data/test/unit/module_methods_test.rb +2 -5
data/test/unit/multiple_yields_test.rb +0 -2
data/test/unit/no_yields_test.rb +0 -2
data/test/unit/object_inspect_test.rb +26 -5
data/test/unit/object_methods_test.rb +9 -10
data/test/unit/parameter_matchers/all_of_test.rb +0 -2
data/test/unit/parameter_matchers/any_of_test.rb +0 -2
data/test/unit/parameter_matchers/anything_test.rb +2 -4
data/test/unit/parameter_matchers/equals_test.rb +1 -3
data/test/unit/parameter_matchers/equivalent_uri_test.rb +0 -10
data/test/unit/parameter_matchers/has_entries_test.rb +3 -3
data/test/unit/parameter_matchers/has_entry_test.rb +14 -15
data/test/unit/parameter_matchers/has_key_test.rb +1 -2
data/test/unit/parameter_matchers/has_value_test.rb +1 -3
data/test/unit/parameter_matchers/includes_test.rb +9 -10
data/test/unit/parameter_matchers/instance_of_test.rb +1 -3
data/test/unit/parameter_matchers/is_a_test.rb +1 -3
data/test/unit/parameter_matchers/kind_of_test.rb +1 -3
data/test/unit/parameter_matchers/not_test.rb +0 -2
data/test/unit/parameter_matchers/regexp_matches_test.rb +1 -2
data/test/unit/parameter_matchers/responds_with_test.rb +10 -4
data/test/unit/parameter_matchers/stub_matcher.rb +0 -4
data/test/unit/parameter_matchers/yaml_equivalent_test.rb +1 -3
data/test/unit/parameters_matcher_test.rb +2 -4
data/test/unit/receivers_test.rb +8 -6
data/test/unit/return_values_test.rb +28 -25
data/test/unit/sequence_test.rb +1 -5
data/test/unit/single_return_value_test.rb +6 -3
data/test/unit/single_yield_test.rb +0 -2
data/test/unit/state_machine_test.rb +1 -3
data/test/unit/string_inspect_test.rb +2 -4
data/test/unit/thrower_test.rb +7 -4
data/test/unit/yield_parameters_test.rb +0 -2
data/yard-templates/default/layout/html/google_analytics.erb +6 -9
data/yard-templates/default/layout/html/setup.rb +2 -3
metadata +81 -49
data/lib/mocha/class_method.rb +0 -119
data/lib/mocha/mini_test.rb +0 -5
data/lib/mocha/module_method.rb +0 -8
data/lib/mocha/module_methods.rb +0 -14
data/lib/mocha/parameter_matchers/object.rb +0 -17
data/lib/mocha/standalone.rb +0 -4
data/lib/mocha/unexpected_invocation.rb +0 -26
data/lib/mocha_standalone.rb +0 -4
data/test/acceptance/mock_with_initializer_block_test.rb +0 -58
data/test/unit/class_method_test.rb +0 -229

data/docs/top-level-namespace.html ADDED

@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Top Level Namespace
+    &mdash; Mocha 1.10.1
+</title>
+  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
+<script type="text/javascript" charset="utf-8">
+  pathId = "";
+  relpath = '';
+</script>
+  <script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
+  <script type="text/javascript" charset="utf-8" src="js/app.js"></script>
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+    <a href="_index.html">Index</a> &raquo;
+    <span class="title">Top Level Namespace</span>
+</div>
+        <div id="search">
+    <a class="full_list_link" id="class_list_link"
+        href="class_list.html">
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+</div>
+        <div class="clear"></div>
+      </div>
+      <div id="content"><h1>Top Level Namespace
+</h1>
+<div class="box_info">
+</div>
+<h2>Defined Under Namespace</h2>
+<p class="children">
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Mocha.html" title="Mocha (module)">Mocha</a></span>
+</p>
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-625523-7"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', 'UA-625523-7');
+</script>
+</div>
+      <div id="footer">
+  Generated on Wed Dec  4 09:20:46 2019 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.20 (ruby-2.6.5).
+</div>
+    </div>
+  </body>
+</html>

data/gemfiles/Gemfile.minitest.5.11.3 ADDED

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+gemspec :path=>"../"
+group :development do
+  gem "minitest", "5.11.3"
+end

data/init.rb CHANGED

@@ -1,3 +1 @@
-# Mocha should no longer be loaded at plugin load time
-# You should explicitly load Mocha *after* Test::Unit or MiniTest have been loaded
-# e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb
+warn 'Mocha deprecation warning: The old-style Rails plugin will not be supported in future versions of Mocha.'

data/lib/mocha.rb CHANGED

@@ -1 +1,9 @@
 require 'mocha/version'
+require 'mocha/ruby_version'
+require 'mocha/deprecation'
+if Mocha::PRE_RUBY_V19
+  Mocha::Deprecation.warning(
+    'Versions of Ruby earlier than v1.9 will not be supported in future versions of Mocha.'
+  )
+end

data/lib/mocha/any_instance_method.rb CHANGED

@@ -1,72 +1,24 @@
 require 'mocha/ruby_version'
-require 'mocha/class_method'
+require 'mocha/stubbed_method'
 module Mocha
+  class AnyInstanceMethod < StubbedMethod
+    private
-  class AnyInstanceMethod < ClassMethod
-    def mock
-      stubbee.any_instance.mocha
-    end
-    def reset_mocha
-      stubbee.any_instance.reset_mocha
-    end
-    def hide_original_method
-      if @original_visibility = method_visibility(method)
-        begin
-          if RUBY_V2_PLUS
-            @definition_target = PrependedModule.new
-            stubbee.__send__ :prepend, @definition_target
-          else
-            @original_method = stubbee.instance_method(method)
-            if @original_method && @original_method.owner == stubbee
-              stubbee.send(:remove_method, method)
-            end
-          end
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
-        end
-      end
-    end
-    def define_new_method
-      definition_target.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
-        def #{method}(*args, &block)
-          self.class.any_instance.mocha.method_missing(:#{method}, *args, &block)
-        end
-      CODE
-      if @original_visibility
-        Module.instance_method(@original_visibility).bind(definition_target).call(method)
-      end
+    def mock_owner
+      stubbee.any_instance
     end
-    def remove_new_method
-      definition_target.send(:remove_method, method)
+    def method_body(method)
+      method
     end
-    def restore_original_method
-      unless RUBY_V2_PLUS
-        if @original_method && @original_method.owner == stubbee
-          stubbee.send(:define_method, method, @original_method)
-          Module.instance_method(@original_visibility).bind(stubbee).call(method)
-        end
-      end
+    def stubbee_method(method_name)
+      stubbee.instance_method(method_name)
     end
-    def method_visibility(method)
-      (stubbee.public_instance_methods(true).include?(method) && :public) ||
-        (stubbee.protected_instance_methods(true).include?(method) && :protected) ||
-        (stubbee.private_instance_methods(true).include?(method) && :private)
+    def original_method_owner
+      stubbee
     end
-    private
-    def definition_target
-      @definition_target ||= stubbee
-    end
   end
 end

data/lib/mocha/api.rb CHANGED

@@ -3,36 +3,60 @@ require 'mocha/hooks'
 require 'mocha/mockery'
 require 'mocha/sequence'
 require 'mocha/object_methods'
-require 'mocha/module_methods'
 require 'mocha/class_methods'
 module Mocha
   # Methods added to +Test::Unit::TestCase+, +MiniTest::Unit::TestCase+ or equivalent.
+  # The mock creation methods are {#mock}, {#stub} and {#stub_everything}, all of which return a #{Mock}
+  # which can be further modified by {Mock#responds_like} and {Mock#responds_like_instance_of} methods,
+  # both of which return a {Mock}, too, and can therefore, be chained to the original creation methods.
+  #
+  # {Mock#responds_like} and {Mock#responds_like_instance_of} force the mock to indicate what it is
+  # supposed to be mocking, thus making it a safer verifying mock. They check that the underlying +responder+
+  # will actually respond to the methods being stubbed, throwing a +NoMethodError+ upon invocation otherwise.
+  #
+  # @example Verifying mock using {Mock#responds_like_instance_of}
+  #   class Sheep
+  #     def initialize
+  #       raise "some awkward code we don't want to call"
+  #     end
+  #     def chew(grass); end
+  #   end
+  #
+  #   sheep = mock('sheep').responds_like_instance_of(Sheep)
+  #   sheep.expects(:chew)
+  #   sheep.expects(:foo)
+  #   sheep.respond_to?(:chew) # => true
+  #   sheep.respond_to?(:foo) # => false
+  #   sheep.chew
+  #   sheep.foo # => raises NoMethodError exception
   module API
     include ParameterMatchers
     include Hooks
     # @private
-    def self.included(mod)
+    def self.included(_mod)
       Object.send(:include, Mocha::ObjectMethods)
-      Module.send(:include, Mocha::ModuleMethods)
       Class.send(:include, Mocha::ClassMethods)
     end
+    # @private
+    def self.extended(mod)
+      included(mod)
+    end
     # Builds a new mock object
     #
-    # @param [String] name identifies mock object in error messages.
-    # @param [Hash] expected_methods_vs_return_values expected method name symbols as keys and corresponding return values as values - these expectations are setup as if {Mock#expects} were called multiple times.
-    # @yield optional block to be evaluated in the context of the mock object instance, giving an alternative way to setup stubbed methods.
-    # @yield note that the block is evaulated by calling Mock#instance_eval and so things like instance variables declared in the test will not be available within the block.
-    # @yield deprecated: use Object#tap or define stubs/expectations with an explicit receiver instead.
     # @return [Mock] a new mock object
     #
-    # @overload def mock(name, &block)
-    # @overload def mock(expected_methods_vs_return_values = {}, &block)
-    # @overload def mock(name, expected_methods_vs_return_values = {}, &block)
+    # @overload def mock(name)
+    #   @param [String, Symbol] name identifies mock object in error messages.
+    #   @note Prior to v1.10.0 when +name+ was a +Symbol+, this method returned an unnamed +Mock+ that stubbed the method identified by +name+. This was undocumented behaviour and it no longer exists.
+    # @overload def mock(expected_methods_vs_return_values = {})
+    #   @param [Hash] expected_methods_vs_return_values expected method name symbols as keys and corresponding return values as values - these expectations are setup as if {Mock#expects} were called multiple times.
+    # @overload def mock(name, expected_methods_vs_return_values = {})
+    #   @param [String, Symbol] name identifies mock object in error messages.
+    #   @param [Hash] expected_methods_vs_return_values expected method name symbols as keys and corresponding return values as values - these expectations are setup as if {Mock#expects} were called multiple times.
     #
     # @example Using expected_methods_vs_return_values Hash to setup expectations.
     #   def test_motor_starts_and_stops
@@ -41,36 +65,21 @@ module Mocha
     #     assert motor.stop
     #     # an error will be raised unless both Motor#start and Motor#stop have been called
     #   end
-    # @example Using the optional block to setup expectations & stubbed methods [deprecated].
-    #   def test_motor_starts_and_stops
-    #     motor = mock('motor') do
-    #       expects(:start).with(100.rpm).returns(true)
-    #       stubs(:stop).returns(true)
-    #     end
-    #     assert motor.start(100.rpm)
-    #     assert motor.stop
-    #     # an error will only be raised if Motor#start(100.rpm) has not been called
-    #   end
-    def mock(*arguments, &block)
-      name = arguments.shift if arguments.first.is_a?(String)
-      expectations = arguments.shift || {}
-      mock = name ? Mockery.instance.named_mock(name, &block) : Mockery.instance.unnamed_mock(&block)
-      mock.expects(expectations)
-      mock
+    def mock(*arguments)
+      create_mock(arguments) { |mock, expectations| mock.expects(expectations) }
     end
     # Builds a new mock object
     #
-    # @param [String] name identifies mock object in error messages.
-    # @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
-    # @yield optional block to be evaluated in the context of the mock object instance, giving an alternative way to setup stubbed methods.
-    # @yield note that the block is evaulated by calling Mock#instance_eval and so things like instance variables declared in the test will not be available within the block.
-    # @yield deprecated: use Object#tap or define stubs/expectations with an explicit receiver instead.
     # @return [Mock] a new mock object
     #
-    # @overload def stub(name, &block)
-    # @overload def stub(stubbed_methods_vs_return_values = {}, &block)
-    # @overload def stub(name, stubbed_methods_vs_return_values = {}, &block)
+    # @overload def stub(name)
+    #   @param [String, Symbol] name identifies mock object in error messages.
+    #   @note Prior to v1.10.0 when +name+ was a +Symbol+, this method returned an unnamed +Mock+ that stubbed the method identified by +name+. This was undocumented behaviour and it no longer exists.
+    # @overload def stub(stubbed_methods_vs_return_values = {})
+    #   @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
+    # @overload def stub(name, stubbed_methods_vs_return_values = {})
+    #   @param [String, Symbol] name identifies mock object in error messages.
     #
     # @example Using stubbed_methods_vs_return_values Hash to setup stubbed methods.
     #   def test_motor_starts_and_stops
@@ -79,37 +88,22 @@ module Mocha
     #     assert motor.stop
     #     # an error will not be raised even if either Motor#start or Motor#stop has not been called
     #   end
-    #
-    # @example Using the optional block to setup expectations & stubbed methods [deprecated].
-    #   def test_motor_starts_and_stops
-    #     motor = stub('motor') do
-    #       expects(:start).with(100.rpm).returns(true)
-    #       stubs(:stop).returns(true)
-    #     end
-    #     assert motor.start(100.rpm)
-    #     assert motor.stop
-    #     # an error will only be raised if Motor#start(100.rpm) has not been called
-    #   end
-    def stub(*arguments, &block)
-      name = arguments.shift if arguments.first.is_a?(String)
-      expectations = arguments.shift || {}
-      stub = name ? Mockery.instance.named_mock(name, &block) : Mockery.instance.unnamed_mock(&block)
-      stub.stubs(expectations)
-      stub
+    def stub(*arguments)
+      create_mock(arguments) { |stub, expectations| stub.stubs(expectations) }
     end
     # Builds a mock object that accepts calls to any method. By default it will return +nil+ for any method call.
     #
-    # @param [String] name identifies mock object in error messages.
-    # @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
-    # @yield optional block to be evaluated in the context of the mock object instance, giving an alternative way to setup stubbed methods.
-    # @yield note that the block is evaulated by calling Mock#instance_eval and so things like instance variables declared in the test will not be available within the block.
-    # @yield deprecated: use Object#tap or define stubs/expectations with an explicit receiver instead.
     # @return [Mock] a new mock object
     #
-    # @overload def stub_everything(name, &block)
-    # @overload def stub_everything(stubbed_methods_vs_return_values = {}, &block)
-    # @overload def stub_everything(name, stubbed_methods_vs_return_values = {}, &block)
+    # @overload def stub_everything(name)
+    #   @param [String, Symbol] name identifies mock object in error messages.
+    #   @note Prior to v1.10.0 when +name+ was a +Symbol+, this method returned an unnamed +Mock+ that stubbed everything. This was undocumented behaviour and it no longer exists.
+    # @overload def stub_everything(stubbed_methods_vs_return_values = {})
+    #   @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
+    # @overload def stub_everything(name, stubbed_methods_vs_return_values = {})
+    #   @param [String, Symbol] name identifies mock object in error messages.
+    #   @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
     #
     # @example Ignore invocations of irrelevant methods.
     #   def test_motor_stops
@@ -118,13 +112,11 @@ module Mocha
     #     assert_nil motor.irrelevant_method_2 # => no error raised
     #     assert motor.stop
     #   end
-    def stub_everything(*arguments, &block)
-      name = arguments.shift if arguments.first.is_a?(String)
-      expectations = arguments.shift || {}
-      stub = name ? Mockery.instance.named_mock(name, &block) : Mockery.instance.unnamed_mock(&block)
-      stub.stub_everything
-      stub.stubs(expectations)
-      stub
+    def stub_everything(*arguments)
+      create_mock(arguments) do |stub, expectations|
+        stub.stub_everything
+        stub.stubs(expectations)
+      end
     end
     # Builds a new sequence which can be used to constrain the order in which expectations can occur.
@@ -177,6 +169,14 @@ module Mocha
       Mockery.instance.new_state_machine(name)
     end
-  end
+    private
+    def create_mock(arguments)
+      name = arguments.shift.to_s if arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
+      expectations = arguments.shift || {}
+      mock = name ? Mockery.instance.named_mock(name) : Mockery.instance.unnamed_mock
+      yield mock, expectations
+      mock
+    end
+  end
 end

data/lib/mocha/argument_iterator.rb CHANGED

@@ -1,21 +1,17 @@
 module Mocha
   class ArgumentIterator
     def initialize(argument)
       @argument = argument
     end
-    def each(&block)
-      if @argument.is_a?(Hash) then
+    def each
+      if @argument.is_a?(Hash)
         @argument.each do |method_name, return_value|
-          block.call(method_name, return_value)
+          yield method_name, return_value
         end
       else
-        block.call(@argument)
+        yield @argument
       end
     end
   end
 end