RubyGems - mocha - Versions diffs - 1.9.0 → 1.10.0.alpha - Mend

mocha 1.9.0 → 1.10.0.alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (200) hide show

checksums.yaml +4 -4
data/.rubocop.yml +3 -0
data/.rubocop_todo.yml +7 -30
data/README.md +10 -11
data/RELEASE.md +48 -0
data/Rakefile +9 -3
data/docs/CNAME +1 -0
data/docs/Mocha.html +132 -5
data/docs/Mocha/API.html +289 -216
data/docs/Mocha/ClassMethods.html +88 -16
data/docs/Mocha/Configuration.html +931 -174
data/docs/Mocha/Expectation.html +200 -255
data/docs/Mocha/ExpectationError.html +5 -10
data/docs/Mocha/ExpectationErrorFactory.html +9 -18
data/docs/Mocha/Hooks.html +12 -27
data/docs/Mocha/Integration.html +3 -3
data/docs/Mocha/Integration/MiniTest.html +3 -3
data/docs/Mocha/Integration/MiniTest/Adapter.html +5 -6
data/docs/Mocha/Integration/TestUnit.html +3 -3
data/docs/Mocha/Integration/TestUnit/Adapter.html +5 -6
data/docs/Mocha/Mock.html +202 -162
data/docs/Mocha/ObjectMethods.html +121 -68
data/docs/Mocha/ParameterMatchers.html +21 -109
data/docs/Mocha/ParameterMatchers/AllOf.html +4 -5
data/docs/Mocha/ParameterMatchers/AnyOf.html +4 -5
data/docs/Mocha/ParameterMatchers/AnyParameters.html +3 -3
data/docs/Mocha/ParameterMatchers/Anything.html +3 -3
data/docs/Mocha/ParameterMatchers/Base.html +8 -15
data/docs/Mocha/ParameterMatchers/Equals.html +4 -5
data/docs/Mocha/ParameterMatchers/EquivalentUri.html +3 -3
data/docs/Mocha/ParameterMatchers/HasEntries.html +4 -5
data/docs/Mocha/ParameterMatchers/HasEntry.html +4 -5
data/docs/Mocha/ParameterMatchers/HasKey.html +4 -5
data/docs/Mocha/ParameterMatchers/HasValue.html +4 -5
data/docs/Mocha/ParameterMatchers/Includes.html +4 -5
data/docs/Mocha/ParameterMatchers/InstanceOf.html +4 -5
data/docs/Mocha/ParameterMatchers/IsA.html +3 -3
data/docs/Mocha/ParameterMatchers/KindOf.html +4 -5
data/docs/Mocha/ParameterMatchers/Not.html +4 -5
data/docs/Mocha/ParameterMatchers/Optionally.html +3 -3
data/docs/Mocha/ParameterMatchers/RegexpMatches.html +4 -5
data/docs/Mocha/ParameterMatchers/RespondsWith.html +4 -5
data/docs/Mocha/ParameterMatchers/YamlEquivalent.html +4 -5
data/docs/Mocha/Sequence.html +3 -3
data/docs/Mocha/StateMachine.html +13 -25
data/docs/Mocha/StateMachine/State.html +4 -5
data/docs/Mocha/StateMachine/StatePredicate.html +4 -5
data/docs/Mocha/StubbingError.html +3 -3
data/docs/_index.html +4 -22
data/docs/class_list.html +1 -1
data/docs/file.COPYING.html +3 -3
data/docs/file.MIT-LICENSE.html +3 -3
data/docs/file.README.html +18 -15
data/docs/file.RELEASE.html +58 -3
data/docs/frames.html +1 -1
data/docs/index.html +18 -15
data/docs/method_list.html +103 -39
data/docs/top-level-namespace.html +3 -3
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 +9 -25
data/lib/mocha/api.rb +62 -66
data/lib/mocha/cardinality.rb +26 -11
data/lib/mocha/class_methods.rb +16 -15
data/lib/mocha/configuration.rb +295 -67
data/lib/mocha/detection/test_unit.rb +1 -3
data/lib/mocha/exception_raiser.rb +2 -1
data/lib/mocha/expectation.rb +56 -58
data/lib/mocha/expectation_error.rb +1 -3
data/lib/mocha/expectation_list.rb +6 -6
data/lib/mocha/inspect.rb +28 -26
data/lib/mocha/instance_method.rb +19 -2
data/lib/mocha/integration.rb +1 -3
data/lib/mocha/integration/mini_test.rb +7 -0
data/lib/mocha/integration/test_unit.rb +7 -0
data/lib/mocha/invocation.rb +61 -0
data/lib/mocha/macos_version.rb +5 -0
data/lib/mocha/minitest.rb +6 -1
data/lib/mocha/mock.rb +46 -31
data/lib/mocha/mockery.rb +28 -61
data/lib/mocha/names.rb +1 -1
data/lib/mocha/object_methods.rb +13 -19
data/lib/mocha/parameter_matchers.rb +1 -1
data/lib/mocha/parameter_matchers/all_of.rb +1 -1
data/lib/mocha/parameter_matchers/any_of.rb +1 -1
data/lib/mocha/parameter_matchers/equivalent_uri.rb +0 -9
data/lib/mocha/parameter_matchers/includes.rb +2 -0
data/lib/mocha/parameter_matchers/instance_methods.rb +18 -0
data/lib/mocha/raised_exception.rb +11 -0
data/lib/mocha/return_values.rb +3 -3
data/lib/mocha/setup.rb +5 -0
data/lib/mocha/single_return_value.rb +2 -1
data/lib/mocha/singleton_class.rb +9 -0
data/lib/mocha/{class_method.rb → stubbed_method.rb} +23 -43
data/lib/mocha/test_unit.rb +6 -1
data/lib/mocha/thrower.rb +2 -1
data/lib/mocha/thrown_object.rb +12 -0
data/lib/mocha/version.rb +1 -1
data/mocha.gemspec +1 -3
data/test/acceptance/acceptance_test_helper.rb +6 -0
data/test/acceptance/bug_18914_test.rb +0 -1
data/test/acceptance/bug_21465_test.rb +0 -1
data/test/acceptance/bug_21563_test.rb +0 -1
data/test/acceptance/display_matching_invocations_alongside_expectations_test.rb +69 -0
data/test/acceptance/exception_rescue_test.rb +1 -2
data/test/acceptance/expectations_on_multiple_methods_test.rb +0 -1
data/test/acceptance/expected_invocation_count_test.rb +2 -3
data/test/acceptance/failure_messages_test.rb +0 -1
data/test/acceptance/issue_272_test.rb +1 -2
data/test/acceptance/issue_65_test.rb +0 -1
data/test/acceptance/issue_70_test.rb +0 -1
data/test/acceptance/mocha_example_test.rb +0 -1
data/test/acceptance/mocha_test_result_test.rb +0 -1
data/test/acceptance/mock_test.rb +47 -6
data/test/acceptance/mocked_methods_dispatch_test.rb +0 -1
data/test/acceptance/multiple_expectations_failure_message_test.rb +0 -1
data/test/acceptance/optional_parameters_test.rb +0 -1
data/test/acceptance/parameter_matcher_test.rb +0 -1
data/test/acceptance/partial_mocks_test.rb +0 -1
data/test/acceptance/prepend_test.rb +0 -1
data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb +0 -1
data/test/acceptance/raise_exception_test.rb +0 -1
data/test/acceptance/return_value_test.rb +0 -1
data/test/acceptance/sequence_test.rb +0 -1
data/test/acceptance/states_test.rb +0 -1
data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb +1 -2
data/test/acceptance/stub_any_instance_method_test.rb +20 -1
data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +0 -1
data/test/acceptance/stub_class_method_defined_on_class_test.rb +0 -1
data/test/acceptance/stub_class_method_defined_on_module_test.rb +0 -1
data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +1 -2
data/test/acceptance/stub_everything_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_class_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_module_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +0 -1
data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +0 -1
data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb +0 -1
data/test/acceptance/stub_module_method_test.rb +0 -1
data/test/acceptance/stub_test.rb +0 -1
data/test/acceptance/stubba_example_test.rb +0 -1
data/test/acceptance/stubba_test_result_test.rb +0 -1
data/test/acceptance/stubbing_error_backtrace_test.rb +4 -5
data/test/acceptance/stubbing_frozen_object_test.rb +0 -1
data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +0 -1
data/test/acceptance/stubbing_method_unnecessarily_test.rb +5 -5
data/test/acceptance/stubbing_nil_test.rb +5 -5
data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +11 -11
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 +8 -8
data/test/acceptance/stubbing_non_public_class_method_test.rb +9 -9
data/test/acceptance/stubbing_non_public_instance_method_test.rb +9 -9
data/test/acceptance/stubbing_on_non_mock_object_test.rb +5 -5
data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +0 -1
data/test/acceptance/throw_test.rb +0 -1
data/test/acceptance/unexpected_invocation_test.rb +0 -1
data/test/acceptance/unstubbing_test.rb +0 -1
data/test/integration/shared_tests.rb +5 -3
data/test/method_definer.rb +11 -17
data/test/test_runner.rb +2 -0
data/test/unit/any_instance_method_test.rb +41 -40
data/test/unit/cardinality_test.rb +41 -23
data/test/unit/central_test.rb +0 -1
data/test/unit/class_methods_test.rb +1 -1
data/test/unit/configuration_test.rb +12 -12
data/test/unit/exception_raiser_test.rb +10 -5
data/test/unit/expectation_list_test.rb +13 -11
data/test/unit/expectation_test.rb +88 -103
data/test/unit/instance_method_test.rb +282 -0
data/test/unit/mock_test.rb +28 -19
data/test/unit/mockery_test.rb +8 -11
data/test/unit/module_methods_test.rb +2 -3
data/test/unit/object_inspect_test.rb +6 -4
data/test/unit/object_methods_test.rb +3 -2
data/test/unit/parameter_matchers/equivalent_uri_test.rb +0 -9
data/test/unit/parameter_matchers/has_entries_test.rb +1 -1
data/test/unit/parameter_matchers/has_entry_test.rb +1 -1
data/test/unit/parameter_matchers/has_key_test.rb +1 -1
data/test/unit/parameter_matchers/has_value_test.rb +1 -1
data/test/unit/parameter_matchers/includes_test.rb +1 -1
data/test/unit/parameter_matchers/responds_with_test.rb +1 -1
data/test/unit/return_values_test.rb +25 -20
data/test/unit/single_return_value_test.rb +6 -1
data/test/unit/thrower_test.rb +7 -2
metadata +16 -30
data/docs/Mocha/UnexpectedInvocation.html +0 -140
data/lib/mocha/mini_test.rb +0 -5
data/lib/mocha/module_method.rb +0 -6
data/lib/mocha/module_methods.rb +0 -10
data/lib/mocha/parameter_matchers/object.rb +0 -15
data/lib/mocha/standalone.rb +0 -4
data/lib/mocha/unexpected_invocation.rb +0 -24
data/lib/mocha_standalone.rb +0 -4
data/test/acceptance/mock_with_initializer_block_test.rb +0 -56
data/test/unit/class_method_test.rb +0 -276

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1d0e385d6aa624c452c0d2e0eb61d9654b95db083371ff2ea3ea942c4ca7826
-  data.tar.gz: 823ab524717c9fd84d55e9b8be08e583cd183a0dc1b30e7d8f6e7cc8e7739f98
+  metadata.gz: 17067ef2117df2bcf63d40f8e764f28d584a5e6243e40d42533a571532329c43
+  data.tar.gz: c2ce2f9b3ca8950dc8fa8958a106bac339f3a96018849c50954ac4b53f024893
 SHA512:
-  metadata.gz: 404f70ce4517676e56def76d6d21c5d0039afdcfcf46d976162b8c2d50c35c5d4e28a075b84c16481c40574553bda5482b61b5a54118f430b792f7db9bdaa479
-  data.tar.gz: 439b05b74aa97d6a87288f6477e0caa4c78bf92c2b3942027662d64d9ca631c630f085201d6e79b936b8e6ac70565dfd8be7e9897820f69f3e84b9642919648f
+  metadata.gz: c40927eb7a63d40a2fd77676e5a3c2362d20f3e0601386c3e848f96d631d1ee1101d46619ed8a3f1fea952e3d9a56f0cc9205fe94b115866358bac2baadf3958
+  data.tar.gz: ce24527412963c7c89611d2517ee20790e01efa4dafa5b3c0f6229b7993baaf5c8db2b7e49b378f65d61070390ab0ccf797f7b1cbf1bcfa3ba98f363b6473e21

data/.rubocop.yml CHANGED

@@ -8,6 +8,9 @@ AllCops:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
+Style/Documentation:
+  Enabled: false
 # Enumerable#each_with_object only available since Ruby v1.9
 Style/EachWithObject:
   Enabled: false

data/.rubocop_todo.yml CHANGED

@@ -1,49 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-07-26 12:42:35 +0100 using RuboCop version 0.58.2.
+# on 2019-11-16 18:15:36 +0000 using RuboCop version 0.58.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-# Offense count: 53
+# Offense count: 57
 Metrics/AbcSize:
-  Max: 39
+  Max: 26
-# Offense count: 2
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 48
-# Offense count: 22
+# Offense count: 23
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 368
-# Offense count: 4
-Metrics/CyclomaticComplexity:
-  Max: 9
+  Max: 366
-# Offense count: 173
+# Offense count: 172
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 31
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 158
-# Offense count: 5
-Metrics/PerceivedComplexity:
-  Max: 11
-# Offense count: 105
-Style/Documentation:
-  Enabled: false
-# Offense count: 501
+# Offense count: 545
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

data/README.md CHANGED

@@ -3,11 +3,14 @@
 ### Description
-* A Ruby library for mocking and stubbing.
+* A Ruby library for [mocking](http://xunitpatterns.com/Mock%20Object.html) and [stubbing](http://xunitpatterns.com/Test%20Stub.html) - but deliberately not (yet) [faking](http://xunitpatterns.com/Fake%20Object.html) or [spying](http://xunitpatterns.com/Test%20Spy.html).
 * A unified, simple and readable syntax for both full & partial mocking.
 * Built-in support for MiniTest and Test::Unit.
 * Supported by many other test frameworks.
+### Intended Usage
+Mocha is intended to be used in unit tests for the [Mock Object](http://xunitpatterns.com/Mock%20Object.html) or [Test Stub](http://xunitpatterns.com/Test%20Stub.html) types of [Test Double](http://xunitpatterns.com/Test%20Double.html), not the [Fake Object](http://xunitpatterns.com/Fake%20Object.html) or [Test Spy](http://xunitpatterns.com/Test%20Spy.html) types. Although it would be possible to extend Mocha to allow the implementation of fakes and spies, we have chosen to keep it focused on mocks and stubs.
 ### Installation
 #### Gem
@@ -92,14 +95,6 @@ end
 Note: There is no need to use a require statement to setup Mocha; RSpec does this itself.
-#### Rails Plugin
-Install the Rails plugin...
-    $ rails plugin install git://github.com/freerange/mocha.git
-Note: As of version 0.9.8, the Mocha plugin is not automatically setup at plugin load time. Instead it must be manually setup e.g. at the bottom of your `test_helper.rb`.
 ##### MiniTest
 ```ruby
@@ -115,7 +110,6 @@ require 'mocha/minitest'
 * 0.13.x versions cause a harmless, but annoying, deprecation warning when used with Rails 3.2.0-3.2.12, 3.1.0-3.1.10 & 3.0.0-3.0.19.
 * 0.11.x versions don't work with Rails 3.2.13 (`TypeError: superclass mismatch for class ExpectationError`). See #115.
 * Versions 0.10.2, 0.10.3 & 0.11.0 of the Mocha gem were broken. Please do not use these versions.
-* Versions 0.9.6 & 0.9.7 of the Mocha Rails plugin were broken. Please do not use these versions.
 ### Usage
@@ -285,6 +279,11 @@ If you want, Mocha can generate a warning or raise an exception when:
 See the [documentation](https://mocha.jamesmead.org/Mocha/Configuration.html) for `Mocha::Configuration` for further details.
+##### MOCHA_OPTIONS
+`MOCHA_OPTIONS` is an environment variable whose value can be set to a comma-separated list, so that we can specify multiple options e.g. `MOCHA_OPTIONS=debug,use_test_unit_gem`.
+Only the following values are currently recognized and have an effect:
+* `debug`: Enables a debug mode which will output backtraces for each deprecation warning. This is useful for finding where in the test suite the deprecated calls are.
 ### Useful Links
 * [Official Documentation](https://mocha.jamesmead.org)
@@ -309,7 +308,7 @@ See this [list of contributors](https://github.com/freerange/mocha/graphs/contri
 * Check Travis CI build is passing - https://travis-ci.org/freerange/mocha
 * Sign in to Google Analytics - https://analytics.google.com/analytics/web/
-* Find the web property ID for Go Free Range Ltd > Mocha Documentation (UA-625523-7)
+* Find the web property ID for floehopper (625523) > Mocha Documentation (UA-625523-7)
 * Generate documentation:
 ```bash

data/RELEASE.md CHANGED

@@ -1,5 +1,53 @@
 # Release Notes
+## 1.10.0.alpha
+### External changes
+* Remove dependency on metaclass gem (#49, #365)
+* Accept symbol (as well as a string) as mock/stub name - thanks to @nitishr (#347, #353, #377)
+* More realistic examples in documentation for `Expectation#yields` and `#multiple_yields` - thanks to @nitishr (#352, #383)
+* Improve documentation for `Mock#responds_like` & `#responds_like_instance_of` - thanks to @nitishr (#337, #384)
+* Make `Expectation#yields` & `Expectation#multiple_yields` fail when the caller of the stubbed method does not provide a block. This is a change to an undocumented aspect of the public API's behaviour. If this causes your tests to fail, then fix it by removing the unnecessary call to `Expectation#yields` or `Expectation#multiple_yields` - thanks to @nitishr (#382)
+* Document `MOCHA_OPTIONS` in README - thanks to @nitishr (#311, #386)
+* Add documentation to explain how Mocha is intended to be used - thanks to @nitishr (#330, #385)
+* Deprecation warning if integration using 'mocha/test_unit' or 'mocha/minitest' fails - thanks to @nitishr (#229, #389, c6032d0b)
+* Require at least one specified sequence for `Expectation#in_sequence` - thanks to @nitishr (#79, #396, 9020248a)
+* Make signatures of `Mock#unstub` & `ObjectMethods#unstub` consistent - thanks to @nitishr (#397, f04d437)
+* Deprecate requiring 'mocha/setup' (36adf880)
+* Optionally display matching invocations alongside expectations - thanks to @nitishr (#178, #394, 00f0540, #410)
+* Put deprecations into effect (#400, #418):
+  * Remove deprecated 'mocha_standalone.rb' & 'mocha/standalone.rb'
+  * Fail fast if no test library loaded
+  * Removed optional block for `Mocha::API#mock`, `#stub` & `#stub_everything`
+  * Remove deprecated `ParameterMatchers#has_equivalent_query_string` method
+  * Remove deprecated 'mocha/mini_test.rb'
+* Fix typo in docs for `Mocha::Configuration.prevent` (266ce71c)
+* New-style configuration (see documentation for `Mocha::Configuration`) (#407, #421)
+* Deprecate support for Ruby versions earlier than v1.9 (#325, c5f8496d)
+* Deprecate support for versions of test-unit & minitest which need monkey-patching (a34e1a88)
+* Deprecate old-style Rails plugin (#403, 2df77134)
+* Documentation fixes & improvements which also fix YARD warnings (472d5416, a2c0d64a)
+### Internal changes
+* Pin minitest to v5.11.3 for Ruby v1.8.7 to fix build; minitest no longer supports Ruby v1.8.7 (4a0a580)
+* Upgrade JRuby to v9.2.8.0 in Travis CI builds (aa29b3f)
+* Only run rubocop for MRI Ruby versions & non-integration test builds (8f1c6af)
+* Reduce duplication in any instance method class - thanks to @nitishr (#378)
+* Simplify `AnyInstanceMethod`, `ClassMethod`, `InstanceMethod`, `ModuleMethod` class hierarchy - thanks to @nitishr (#381)
+* Simplify `ClassMethods#method_exists?` & `ObjectMethods#method_exists?` making them consistent - thanks to @nitishr (#270, #362, #370)
+* Don't override definition of `singleton_class` in `ClassMethods` - thanks to @nitishr (#391, #392)
+* Do not include 'method_definer' methods into all objects (#268, #402)
+* Distinguish different `ObjectMethods` modules (#268, #404)
+* Pass invocation to expectation list methods - thanks to @nitishr (#408, #409, #411)
+* Consistently use `assert_raises` - thanks to @nitishr (#405, #412, a66b7bed)
+* Update Ruby & JRuby versions in Travis CI config (18cb1a93, eb061c53)
+* Rubocop improvements (aa16ea67...6f4db70b, 2a1240e6...e95716ae)
+* Fix inconsistency in CardinalityTest (aa10e0a8)
+* Fix test failures on Mac OSX Catalina - thanks to @nitishr (#413, #417, #419, 8a0f2535)
+* Remove default argument in `Expectation#invoke` - thanks to @nitishr (#414, #420)
 ## 1.9.0
 * Add TruffleRuby to Travis CI build matrix - thanks to @deepj (#354)

data/Rakefile CHANGED

@@ -17,7 +17,7 @@ task 'test' do
   end
 end
-namespace 'test' do
+namespace 'test' do # rubocop:disable Metrics/BlockLength
   unit_tests = FileList['test/unit/**/*_test.rb']
   all_acceptance_tests = FileList['test/acceptance/*_test.rb']
   ruby186_incompatible_acceptance_tests = FileList['test/acceptance/stub_class_method_defined_on_*_test.rb'] + FileList['test/acceptance/stub_instance_method_defined_on_*_test.rb']
@@ -85,13 +85,14 @@ end
 begin
   require 'rubocop/rake_task'
-  if RUBY_VERSION >= '2.2.0'
+  if RUBY_VERSION >= '2.2.0' && (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby') && ENV['MOCHA_RUN_INTEGRATION_TESTS'].nil?
     RuboCop::RakeTask.new
     task 'test' => 'rubocop'
   end
 rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
+# rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 def benchmark_test_case(klass, iterations)
   require 'benchmark'
   require 'mocha/detection/mini_test'
@@ -119,6 +120,7 @@ def benchmark_test_case(klass, iterations)
     Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, @silent_option) } }
   end
 end
+# rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 if ENV['MOCHA_GENERATE_DOCS']
   require 'yard'
@@ -142,8 +144,12 @@ if ENV['MOCHA_GENERATE_DOCS']
     ]
   end
+  task 'checkout_docs_cname' do
+    `git checkout docs/CNAME`
+  end
   desc 'Generate documentation'
-  task 'generate_docs' => %w[clobber_yardoc yardoc]
+  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname]
 end
 task 'release' => 'default'

data/docs/CNAME ADDED

	@@ -0,0 +1 @@
1	+ mocha.jamesmead.org

data/docs/Mocha.html CHANGED

@@ -6,7 +6,7 @@
 <title>
   Module: Mocha
-    &mdash; Mocha 1.9.0
+    &mdash; Mocha 1.10.0.alpha
 </title>
@@ -79,7 +79,7 @@
   <dl>
     <dt>Defined in:</dt>
     <dd>lib/mocha/api.rb<span class="defines">,<br />
-  lib/mocha/hooks.rb,<br /> lib/mocha/mock.rb,<br /> lib/mocha/expectation.rb,<br /> lib/mocha/object_methods.rb,<br /> lib/mocha/class_methods.rb,<br /> lib/mocha/parameter_matchers.rb,<br /> lib/mocha/parameter_matchers/not.rb,<br /> lib/mocha/parameter_matchers/base.rb,<br /> lib/mocha/parameter_matchers/is_a.rb,<br /> lib/mocha/parameter_matchers/all_of.rb,<br /> lib/mocha/parameter_matchers/any_of.rb,<br /> lib/mocha/parameter_matchers/equals.rb,<br /> lib/mocha/parameter_matchers/object.rb,<br /> lib/mocha/parameter_matchers/has_key.rb,<br /> lib/mocha/parameter_matchers/kind_of.rb,<br /> lib/mocha/parameter_matchers/anything.rb,<br /> lib/mocha/parameter_matchers/includes.rb,<br /> lib/mocha/parameter_matchers/has_entry.rb,<br /> lib/mocha/parameter_matchers/has_value.rb,<br /> lib/mocha/parameter_matchers/optionally.rb,<br /> lib/mocha/parameter_matchers/has_entries.rb,<br /> lib/mocha/parameter_matchers/instance_of.rb,<br /> lib/mocha/parameter_matchers/responds_with.rb,<br /> lib/mocha/parameter_matchers/any_parameters.rb,<br /> lib/mocha/parameter_matchers/equivalent_uri.rb,<br /> lib/mocha/parameter_matchers/regexp_matches.rb,<br /> lib/mocha/parameter_matchers/yaml_equivalent.rb,<br /> lib/mocha/state_machine.rb,<br /> lib/mocha/sequence.rb,<br /> lib/mocha/configuration.rb,<br /> lib/mocha/expectation_error_factory.rb,<br /> lib/mocha/expectation_error.rb,<br /> lib/mocha/stubbing_error.rb,<br /> lib/mocha/unexpected_invocation.rb,<br /> lib/mocha/integration/test_unit/adapter.rb,<br /> lib/mocha/integration/mini_test/adapter.rb</span>
+  lib/mocha/hooks.rb,<br /> lib/mocha/mock.rb,<br /> lib/mocha/expectation.rb,<br /> lib/mocha/object_methods.rb,<br /> lib/mocha/class_methods.rb,<br /> lib/mocha/parameter_matchers.rb,<br /> lib/mocha/parameter_matchers/not.rb,<br /> lib/mocha/parameter_matchers/base.rb,<br /> lib/mocha/parameter_matchers/is_a.rb,<br /> lib/mocha/parameter_matchers/all_of.rb,<br /> lib/mocha/parameter_matchers/any_of.rb,<br /> lib/mocha/parameter_matchers/equals.rb,<br /> lib/mocha/parameter_matchers/has_key.rb,<br /> lib/mocha/parameter_matchers/kind_of.rb,<br /> lib/mocha/parameter_matchers/anything.rb,<br /> lib/mocha/parameter_matchers/includes.rb,<br /> lib/mocha/parameter_matchers/has_entry.rb,<br /> lib/mocha/parameter_matchers/has_value.rb,<br /> lib/mocha/parameter_matchers/optionally.rb,<br /> lib/mocha/parameter_matchers/has_entries.rb,<br /> lib/mocha/parameter_matchers/instance_of.rb,<br /> lib/mocha/parameter_matchers/responds_with.rb,<br /> lib/mocha/parameter_matchers/any_parameters.rb,<br /> lib/mocha/parameter_matchers/equivalent_uri.rb,<br /> lib/mocha/parameter_matchers/regexp_matches.rb,<br /> lib/mocha/parameter_matchers/yaml_equivalent.rb,<br /> lib/mocha/parameter_matchers/instance_methods.rb,<br /> lib/mocha/state_machine.rb,<br /> lib/mocha/sequence.rb,<br /> lib/mocha/configuration.rb,<br /> lib/mocha/expectation_error_factory.rb,<br /> lib/mocha/expectation_error.rb,<br /> lib/mocha/stubbing_error.rb,<br /> lib/mocha/integration/test_unit/adapter.rb,<br /> lib/mocha/integration/mini_test/adapter.rb</span>
 </dd>
   </dl>
@@ -93,7 +93,7 @@
-      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Mocha/Configuration.html" title="Mocha::Configuration (class)">Configuration</a></span>, <span class='object_link'><a href="Mocha/Expectation.html" title="Mocha::Expectation (class)">Expectation</a></span>, <span class='object_link'><a href="Mocha/ExpectationError.html" title="Mocha::ExpectationError (class)">ExpectationError</a></span>, <span class='object_link'><a href="Mocha/ExpectationErrorFactory.html" title="Mocha::ExpectationErrorFactory (class)">ExpectationErrorFactory</a></span>, <span class='object_link'><a href="Mocha/Mock.html" title="Mocha::Mock (class)">Mock</a></span>, <span class='object_link'><a href="Mocha/Sequence.html" title="Mocha::Sequence (class)">Sequence</a></span>, <span class='object_link'><a href="Mocha/StateMachine.html" title="Mocha::StateMachine (class)">StateMachine</a></span>, <span class='object_link'><a href="Mocha/StubbingError.html" title="Mocha::StubbingError (class)">StubbingError</a></span>, <span class='object_link'><a href="Mocha/UnexpectedInvocation.html" title="Mocha::UnexpectedInvocation (class)">UnexpectedInvocation</a></span>
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Mocha/Configuration.html" title="Mocha::Configuration (class)">Configuration</a></span>, <span class='object_link'><a href="Mocha/Expectation.html" title="Mocha::Expectation (class)">Expectation</a></span>, <span class='object_link'><a href="Mocha/ExpectationError.html" title="Mocha::ExpectationError (class)">ExpectationError</a></span>, <span class='object_link'><a href="Mocha/ExpectationErrorFactory.html" title="Mocha::ExpectationErrorFactory (class)">ExpectationErrorFactory</a></span>, <span class='object_link'><a href="Mocha/Mock.html" title="Mocha::Mock (class)">Mock</a></span>, <span class='object_link'><a href="Mocha/Sequence.html" title="Mocha::Sequence (class)">Sequence</a></span>, <span class='object_link'><a href="Mocha/StateMachine.html" title="Mocha::StateMachine (class)">StateMachine</a></span>, <span class='object_link'><a href="Mocha/StubbingError.html" title="Mocha::StubbingError (class)">StubbingError</a></span>
 </p>
@@ -104,7 +104,134 @@
+    <h2>
+      Class Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+    <ul class="summary">
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#configure-class_method" title="configure (class method)">.<strong>configure</strong> {|configuration| ... } &#x21d2; Object </a>
+  </span>
+    <span class="summary_desc"><div class='inline'>
+<p>Allows setting of configuration options.</p>
+</div></span>
+</li>
+    </ul>
+  <div id="class_method_details" class="method_details_list">
+    <h2>Class Method Details</h2>
+      <div class="method_details first">
+  <h3 class="signature first" id="configure-class_method">
+    .<strong>configure</strong> {|configuration| ... } &#x21d2; <tt><span class='object_link'>Object</span></tt>
+</h3><div class="docstring">
+  <div class="discussion">
+<p>Allows setting of configuration options. See <span class='object_link'><a href="Mocha/Configuration.html" title="Mocha::Configuration (class)">Configuration</a></span> for the available options.</p>
+<p>Typically the configuration is set globally in a <code>test_helper.rb</code> or <code>spec_helper.rb</code> file.</p>
+  </div>
+</div>
+<div class="tags">
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+        <p class="example_title"><div class='inline'>
+<p>Setting multiple configuration options</p>
+</div></p>
+      <pre class="example code"><code><span class='const'><span class='object_link'><a href="" title="Mocha (module)">Mocha</a></span></span><span class='period'>.</span><span class='id identifier rubyid_configure'>configure</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_c'>c</span><span class='op'>|</span>
+  <span class='id identifier rubyid_c'>c</span><span class='period'>.</span><span class='id identifier rubyid_stubbing_method_unnecessarily'>stubbing_method_unnecessarily</span> <span class='op'>=</span> <span class='symbol'>:prevent</span>
+  <span class='id identifier rubyid_c'>c</span><span class='period'>.</span><span class='id identifier rubyid_stubbing_method_on_non_mock_object'>stubbing_method_on_non_mock_object</span> <span class='op'>=</span> <span class='symbol'>:warn</span>
+  <span class='id identifier rubyid_c'>c</span><span class='period'>.</span><span class='id identifier rubyid_stubbing_method_on_nil'>stubbing_method_on_nil</span> <span class='op'>=</span> <span class='symbol'>:allow</span>
+<span class='kw'>end</span></code></pre>
+  </div>
+<p class="tag_title">Yield Parameters:</p>
+<ul class="yieldparam">
+    <li>
+        <span class='name'>configuration</span>
+        <span class='type'>(<tt><span class='object_link'><a href="Mocha/Configuration.html" title="Mocha::Configuration (class)">Configuration</a></span></tt>)</span>
+        &mdash;
+        <div class='inline'>
+<p>the configuration for modification</p>
+</div>
+    </li>
+</ul>
+  <p class="tag_title">See Also:</p>
+  <ul class="see">
+      <li><span class='object_link'><a href="Mocha/Configuration.html" title="Mocha::Configuration (class)">Configuration</a></span></li>
+  </ul>
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+17
+18
+19</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/mocha/configuration.rb', line 17</span>
+<span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_configure'>configure</span>
+  <span class='kw'>yield</span> <span class='id identifier rubyid_configuration'>configuration</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+  </div>
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-625523-7"></script>
 <script>
@@ -117,9 +244,9 @@
 </div>
       <div id="footer">
-  Generated on Mon Jun 17 18:38:43 2019 by
+  Generated on Sun Nov 24 15:26:48 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.19 (ruby-2.5.3).
+  0.9.20 (ruby-2.6.5).
 </div>
     </div>

data/docs/Mocha/API.html CHANGED

@@ -6,7 +6,7 @@
 <title>
   Module: Mocha::API
-    &mdash; Mocha 1.9.0
+    &mdash; Mocha 1.10.0.alpha
 </title>
@@ -96,14 +96,40 @@
 <h2>Overview</h2><div class="docstring">
   <div class="discussion">
-<p>Methods added to <code>Test::Unit::TestCase</code>,
-<code>MiniTest::Unit::TestCase</code> or equivalent.</p>
+<p>Methods added to <code>Test::Unit::TestCase</code>, <code>MiniTest::Unit::TestCase</code> or equivalent. The mock creation methods are <span class='object_link'><a href="#mock-instance_method" title="Mocha::API#mock (method)">#mock</a></span>, <span class='object_link'><a href="#stub-instance_method" title="Mocha::API#stub (method)">#stub</a></span> and <span class='object_link'><a href="#stub_everything-instance_method" title="Mocha::API#stub_everything (method)">#stub_everything</a></span>, all of which return a #<span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span> which can be further modified by <span class='object_link'><a href="Mock.html#responds_like-instance_method" title="Mocha::Mock#responds_like (method)">Mock#responds_like</a></span> and <span class='object_link'><a href="Mock.html#responds_like_instance_of-instance_method" title="Mocha::Mock#responds_like_instance_of (method)">Mock#responds_like_instance_of</a></span> methods, both of which return a <span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span>, too, and can therefore, be chained to the original creation methods.</p>
+<p><span class='object_link'><a href="Mock.html#responds_like-instance_method" title="Mocha::Mock#responds_like (method)">Mock#responds_like</a></span> and <span class='object_link'><a href="Mock.html#responds_like_instance_of-instance_method" title="Mocha::Mock#responds_like_instance_of (method)">Mock#responds_like_instance_of</a></span> force the mock to indicate what it is supposed to be mocking, thus making it a safer verifying mock. They check that the underlying <code>responder</code> will actually respond to the methods being stubbed, throwing a <code>NoMethodError</code> upon invocation otherwise.</p>
   </div>
 </div>
 <div class="tags">
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+        <p class="example_title"><div class='inline'>
+<p>Verifying mock using <span class='object_link'><a href="Mock.html#responds_like_instance_of-instance_method" title="Mocha::Mock#responds_like_instance_of (method)">Mock#responds_like_instance_of</a></span></p>
+</div></p>
+      <pre class="example code"><code><span class='kw'>class</span> <span class='const'>Sheep</span>
+  <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>some awkward code we don&#39;t want to call</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>
+  <span class='kw'>def</span> <span class='id identifier rubyid_chew'>chew</span><span class='lparen'>(</span><span class='id identifier rubyid_grass'>grass</span><span class='rparen'>)</span><span class='semicolon'>;</span> <span class='kw'>end</span>
+<span class='kw'>end</span>
+<span class='id identifier rubyid_sheep'>sheep</span> <span class='op'>=</span> <span class='id identifier rubyid_mock'>mock</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>sheep</span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_responds_like_instance_of'>responds_like_instance_of</span><span class='lparen'>(</span><span class='const'>Sheep</span><span class='rparen'>)</span>
+<span class='id identifier rubyid_sheep'>sheep</span><span class='period'>.</span><span class='id identifier rubyid_expects'>expects</span><span class='lparen'>(</span><span class='symbol'>:chew</span><span class='rparen'>)</span>
+<span class='id identifier rubyid_sheep'>sheep</span><span class='period'>.</span><span class='id identifier rubyid_expects'>expects</span><span class='lparen'>(</span><span class='symbol'>:foo</span><span class='rparen'>)</span>
+<span class='id identifier rubyid_sheep'>sheep</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:chew</span><span class='rparen'>)</span> <span class='comment'># =&gt; true
+</span><span class='id identifier rubyid_sheep'>sheep</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:foo</span><span class='rparen'>)</span> <span class='comment'># =&gt; false
+</span><span class='id identifier rubyid_sheep'>sheep</span><span class='period'>.</span><span class='id identifier rubyid_chew'>chew</span>
+<span class='id identifier rubyid_sheep'>sheep</span><span class='period'>.</span><span class='id identifier rubyid_foo'>foo</span> <span class='comment'># =&gt; raises NoMethodError exception</span></code></pre>
+  </div>
 </div>
@@ -123,7 +149,7 @@
         <li class="public ">
   <span class="summary_signature">
-      <a href="#mock-instance_method" title="#mock (instance method)">#<strong>mock</strong>(*arguments) { ... } &#x21d2; Mock </a>
+      <a href="#mock-instance_method" title="#mock (instance method)">#<strong>mock</strong>(*arguments)  &#x21d2; Mock </a>
@@ -162,8 +188,7 @@
     <span class="summary_desc"><div class='inline'>
-<p>Builds a new sequence which can be used to constrain the order in which
-expectations can occur.</p>
+<p>Builds a new sequence which can be used to constrain the order in which expectations can occur.</p>
 </div></span>
 </li>
@@ -187,8 +212,7 @@ expectations can occur.</p>
     <span class="summary_desc"><div class='inline'>
-<p>Builds a new state machine which can be used to constrain the order in
-which expectations can occur.</p>
+<p>Builds a new state machine which can be used to constrain the order in which expectations can occur.</p>
 </div></span>
 </li>
@@ -197,7 +221,7 @@ which expectations can occur.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#stub-instance_method" title="#stub (instance method)">#<strong>stub</strong>(*arguments) { ... } &#x21d2; Mock </a>
+      <a href="#stub-instance_method" title="#stub (instance method)">#<strong>stub</strong>(*arguments)  &#x21d2; Mock </a>
@@ -221,7 +245,7 @@ which expectations can occur.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#stub_everything-instance_method" title="#stub_everything (instance method)">#<strong>stub_everything</strong>(*arguments) { ... } &#x21d2; Mock </a>
+      <a href="#stub_everything-instance_method" title="#stub_everything (instance method)">#<strong>stub_everything</strong>(*arguments)  &#x21d2; Mock </a>
@@ -266,7 +290,7 @@ which expectations can occur.</p>
   <h3 class="inherited">Methods included from <span class='object_link'><a href="ParameterMatchers.html" title="Mocha::ParameterMatchers (module)">ParameterMatchers</a></span></h3>
-  <p class="inherited"><span class='object_link'><a href="ParameterMatchers.html#Not-instance_method" title="Mocha::ParameterMatchers#Not (method)">#Not</a></span>, <span class='object_link'><a href="ParameterMatchers.html#all_of-instance_method" title="Mocha::ParameterMatchers#all_of (method)">#all_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#any_of-instance_method" title="Mocha::ParameterMatchers#any_of (method)">#any_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#any_parameters-instance_method" title="Mocha::ParameterMatchers#any_parameters (method)">#any_parameters</a></span>, <span class='object_link'><a href="ParameterMatchers.html#anything-instance_method" title="Mocha::ParameterMatchers#anything (method)">#anything</a></span>, <span class='object_link'><a href="ParameterMatchers.html#equals-instance_method" title="Mocha::ParameterMatchers#equals (method)">#equals</a></span>, <span class='object_link'><a href="ParameterMatchers.html#equivalent_uri-instance_method" title="Mocha::ParameterMatchers#equivalent_uri (method)">#equivalent_uri</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_entries-instance_method" title="Mocha::ParameterMatchers#has_entries (method)">#has_entries</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_entry-instance_method" title="Mocha::ParameterMatchers#has_entry (method)">#has_entry</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_equivalent_query_string-instance_method" title="Mocha::ParameterMatchers#has_equivalent_query_string (method)">#has_equivalent_query_string</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_key-instance_method" title="Mocha::ParameterMatchers#has_key (method)">#has_key</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_value-instance_method" title="Mocha::ParameterMatchers#has_value (method)">#has_value</a></span>, <span class='object_link'><a href="ParameterMatchers.html#includes-instance_method" title="Mocha::ParameterMatchers#includes (method)">#includes</a></span>, <span class='object_link'><a href="ParameterMatchers.html#instance_of-instance_method" title="Mocha::ParameterMatchers#instance_of (method)">#instance_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#is_a-instance_method" title="Mocha::ParameterMatchers#is_a (method)">#is_a</a></span>, <span class='object_link'><a href="ParameterMatchers.html#kind_of-instance_method" title="Mocha::ParameterMatchers#kind_of (method)">#kind_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#optionally-instance_method" title="Mocha::ParameterMatchers#optionally (method)">#optionally</a></span>, <span class='object_link'><a href="ParameterMatchers.html#regexp_matches-instance_method" title="Mocha::ParameterMatchers#regexp_matches (method)">#regexp_matches</a></span>, <span class='object_link'><a href="ParameterMatchers.html#responds_with-instance_method" title="Mocha::ParameterMatchers#responds_with (method)">#responds_with</a></span>, <span class='object_link'><a href="ParameterMatchers.html#yaml_equivalent-instance_method" title="Mocha::ParameterMatchers#yaml_equivalent (method)">#yaml_equivalent</a></span></p>
+  <p class="inherited"><span class='object_link'><a href="ParameterMatchers.html#Not-instance_method" title="Mocha::ParameterMatchers#Not (method)">#Not</a></span>, <span class='object_link'><a href="ParameterMatchers.html#all_of-instance_method" title="Mocha::ParameterMatchers#all_of (method)">#all_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#any_of-instance_method" title="Mocha::ParameterMatchers#any_of (method)">#any_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#any_parameters-instance_method" title="Mocha::ParameterMatchers#any_parameters (method)">#any_parameters</a></span>, <span class='object_link'><a href="ParameterMatchers.html#anything-instance_method" title="Mocha::ParameterMatchers#anything (method)">#anything</a></span>, <span class='object_link'><a href="ParameterMatchers.html#equals-instance_method" title="Mocha::ParameterMatchers#equals (method)">#equals</a></span>, <span class='object_link'><a href="ParameterMatchers.html#equivalent_uri-instance_method" title="Mocha::ParameterMatchers#equivalent_uri (method)">#equivalent_uri</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_entries-instance_method" title="Mocha::ParameterMatchers#has_entries (method)">#has_entries</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_entry-instance_method" title="Mocha::ParameterMatchers#has_entry (method)">#has_entry</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_key-instance_method" title="Mocha::ParameterMatchers#has_key (method)">#has_key</a></span>, <span class='object_link'><a href="ParameterMatchers.html#has_value-instance_method" title="Mocha::ParameterMatchers#has_value (method)">#has_value</a></span>, <span class='object_link'><a href="ParameterMatchers.html#includes-instance_method" title="Mocha::ParameterMatchers#includes (method)">#includes</a></span>, <span class='object_link'><a href="ParameterMatchers.html#instance_of-instance_method" title="Mocha::ParameterMatchers#instance_of (method)">#instance_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#is_a-instance_method" title="Mocha::ParameterMatchers#is_a (method)">#is_a</a></span>, <span class='object_link'><a href="ParameterMatchers.html#kind_of-instance_method" title="Mocha::ParameterMatchers#kind_of (method)">#kind_of</a></span>, <span class='object_link'><a href="ParameterMatchers.html#optionally-instance_method" title="Mocha::ParameterMatchers#optionally (method)">#optionally</a></span>, <span class='object_link'><a href="ParameterMatchers.html#regexp_matches-instance_method" title="Mocha::ParameterMatchers#regexp_matches (method)">#regexp_matches</a></span>, <span class='object_link'><a href="ParameterMatchers.html#responds_with-instance_method" title="Mocha::ParameterMatchers#responds_with (method)">#responds_with</a></span>, <span class='object_link'><a href="ParameterMatchers.html#yaml_equivalent-instance_method" title="Mocha::ParameterMatchers#yaml_equivalent (method)">#yaml_equivalent</a></span></p>
   <div id="instance_method_details" class="method_details_list">
@@ -277,11 +301,11 @@ which expectations can occur.</p>
   <h3 class="signature first" id="mock-instance_method">
-      <span class="overload">#<strong>mock</strong>(name, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>mock</strong>(name)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
-      <span class="overload">#<strong>mock</strong>(expected_methods_vs_return_values = {}, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>mock</strong>(expected_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
-      <span class="overload">#<strong>mock</strong>(name, expected_methods_vs_return_values = {}, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>mock</strong>(name, expected_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
@@ -313,24 +337,22 @@ which expectations can occur.</p>
   <span class='comment'># an error will be raised unless both Motor#start and Motor#stop have been called
 </span><span class='kw'>end</span></code></pre>
+  </div>
+  <p class="tag_title">Overloads:</p>
+  <ul class="overload">
-        <p class="example_title"><div class='inline'>
-<p>Using the optional block to setup expectations &amp; stubbed methods
-[deprecated].</p>
-</div></p>
-      <pre class="example code"><code><span class='kw'>def</span> <span class='id identifier rubyid_test_motor_starts_and_stops'>test_motor_starts_and_stops</span>
-  <span class='id identifier rubyid_motor'>motor</span> <span class='op'>=</span> <span class='id identifier rubyid_mock'>mock</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>motor</span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span> <span class='kw'>do</span>
-    <span class='id identifier rubyid_expects'>expects</span><span class='lparen'>(</span><span class='symbol'>:start</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_with'>with</span><span class='lparen'>(</span><span class='int'>100</span><span class='period'>.</span><span class='id identifier rubyid_rpm'>rpm</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_returns'>returns</span><span class='lparen'>(</span><span class='kw'>true</span><span class='rparen'>)</span>
-    <span class='id identifier rubyid_stubs'>stubs</span><span class='lparen'>(</span><span class='symbol'>:stop</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_returns'>returns</span><span class='lparen'>(</span><span class='kw'>true</span><span class='rparen'>)</span>
-  <span class='kw'>end</span>
-  <span class='id identifier rubyid_assert'>assert</span> <span class='id identifier rubyid_motor'>motor</span><span class='period'>.</span><span class='id identifier rubyid_start'>start</span><span class='lparen'>(</span><span class='int'>100</span><span class='period'>.</span><span class='id identifier rubyid_rpm'>rpm</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_assert'>assert</span> <span class='id identifier rubyid_motor'>motor</span><span class='period'>.</span><span class='id identifier rubyid_stop'>stop</span>
-  <span class='comment'># an error will only be raised if Motor#start(100.rpm) has not been called
-</span><span class='kw'>end</span></code></pre>
+      <li class="overload_item">
+        <span class="signature">#<strong>mock</strong>(name)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
   </div>
-<p class="tag_title">Parameters:</p>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -338,7 +360,7 @@ which expectations can occur.</p>
         <span class='name'>name</span>
-        <span class='type'>(<tt>String</tt>)</span>
+        <span class='type'>(<tt>String</tt>, <tt>Symbol</tt>)</span>
@@ -349,6 +371,25 @@ which expectations can occur.</p>
     </li>
+</ul>
+</div>
+      </li>
+      <li class="overload_item">
+        <span class="signature">#<strong>mock</strong>(expected_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
         <span class='name'>expected_methods_vs_return_values</span>
@@ -357,68 +398,77 @@ which expectations can occur.</p>
         <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
         &mdash;
         <div class='inline'>
-<p>expected method name symbols as keys and corresponding return values as
-values - these expectations are setup as if <span class='object_link'><a href="Mock.html#expects-instance_method" title="Mocha::Mock#expects (method)">Mock#expects</a></span> were called
-multiple times.</p>
+<p>expected method name symbols as keys and corresponding return values as values - these expectations are setup as if <span class='object_link'><a href="Mock.html#expects-instance_method" title="Mocha::Mock#expects (method)">Mock#expects</a></span> were called multiple times.</p>
 </div>
     </li>
 </ul>
-<p class="tag_title">Yields:</p>
-<ul class="yield">
-    <li>
-        <span class='type'></span>
-        <div class='inline'>
-<p>optional block to be evaluated in the context of the mock object instance,
-giving an alternative way to setup stubbed methods.</p>
 </div>
+      </li>
-    </li>
+      <li class="overload_item">
+        <span class="signature">#<strong>mock</strong>(name, expected_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
+        <span class='name'>name</span>
-        <span class='type'></span>
+        <span class='type'>(<tt>String</tt>, <tt>Symbol</tt>)</span>
+        &mdash;
         <div class='inline'>
-<p>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.</p>
+<p>identifies mock object in error messages.</p>
 </div>
     </li>
     <li>
+        <span class='name'>expected_methods_vs_return_values</span>
-        <span class='type'></span>
+        <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
+        &mdash;
         <div class='inline'>
-<p>deprecated: use Object#tap or define stubs/expectations with an explicit
-receiver instead.</p>
+<p>expected method name symbols as keys and corresponding return values as values - these expectations are setup as if <span class='object_link'><a href="Mock.html#expects-instance_method" title="Mocha::Mock#expects (method)">Mock#expects</a></span> were called multiple times.</p>
 </div>
     </li>
 </ul>
+</div>
+      </li>
+  </ul>
 <p class="tag_title">Returns:</p>
 <ul class="return">
@@ -444,23 +494,15 @@ receiver instead.</p>
       <pre class="lines">
-52
-53
-54
-55
-56
-57
-58</pre>
+62
+63
+64</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 52</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_mock'>mock</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_arguments'>arguments</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_name'>name</span> <span class='op'>=</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_shift'>shift</span> <span class='kw'>if</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>String</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_expectations'>expectations</span> <span class='op'>=</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_shift'>shift</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
-  <span class='id identifier rubyid_mock'>mock</span> <span class='op'>=</span> <span class='id identifier rubyid_name'>name</span> <span class='op'>?</span> <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_named_mock'>named_mock</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span> <span class='op'>:</span> <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_unnamed_mock'>unnamed_mock</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_mock'>mock</span><span class='period'>.</span><span class='id identifier rubyid_expects'>expects</span><span class='lparen'>(</span><span class='id identifier rubyid_expectations'>expectations</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_mock'>mock</span>
+      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 62</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_mock'>mock</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_arguments'>arguments</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_create_mock'>create_mock</span><span class='lparen'>(</span><span class='id identifier rubyid_arguments'>arguments</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_mock'>mock</span><span class='comma'>,</span> <span class='id identifier rubyid_expectations'>expectations</span><span class='op'>|</span> <span class='id identifier rubyid_mock'>mock</span><span class='period'>.</span><span class='id identifier rubyid_expects'>expects</span><span class='lparen'>(</span><span class='id identifier rubyid_expectations'>expectations</span><span class='rparen'>)</span> <span class='rbrace'>}</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -479,11 +521,9 @@ receiver instead.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Builds a new sequence which can be used to constrain the order in which
-expectations can occur.</p>
+<p>Builds a new sequence which can be used to constrain the order in which expectations can occur.</p>
-<p>Specify that an expected invocation must occur within a named <span class='object_link'><a href="Sequence.html" title="Mocha::Sequence (class)">Sequence</a></span> by
-using <span class='object_link'><a href="Expectation.html#in_sequence-instance_method" title="Mocha::Expectation#in_sequence (method)">Expectation#in_sequence</a></span>.</p>
+<p>Specify that an expected invocation must occur within a named <span class='object_link'><a href="Sequence.html" title="Mocha::Sequence (class)">Sequence</a></span> by using <span class='object_link'><a href="Expectation.html#in_sequence-instance_method" title="Mocha::Expectation#in_sequence (method)">Expectation#in_sequence</a></span>.</p>
   </div>
@@ -540,12 +580,12 @@ using <span class='object_link'><a href="Expectation.html#in_sequence-instance_m
       <pre class="lines">
-144
-145
-146</pre>
+130
+131
+132</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 144</span>
+      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 130</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_sequence'>sequence</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='rparen'>)</span>
   <span class='const'><span class='object_link'><a href="Sequence.html" title="Mocha::Sequence (class)">Sequence</a></span></span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='rparen'>)</span>
@@ -567,17 +607,13 @@ using <span class='object_link'><a href="Expectation.html#in_sequence-instance_m
 </h3><div class="docstring">
   <div class="discussion">
-<p>Builds a new state machine which can be used to constrain the order in
-which expectations can occur.</p>
+<p>Builds a new state machine which can be used to constrain the order in which expectations can occur.</p>
-<p>Specify the initial state of the state machine by using
-<span class='object_link'><a href="StateMachine.html#starts_as-instance_method" title="Mocha::StateMachine#starts_as (method)">StateMachine#starts_as</a></span>.</p>
+<p>Specify the initial state of the state machine by using <span class='object_link'><a href="StateMachine.html#starts_as-instance_method" title="Mocha::StateMachine#starts_as (method)">StateMachine#starts_as</a></span>.</p>
-<p>Specify that an expected invocation should change the state of the state
-machine by using <span class='object_link'><a href="Expectation.html#then-instance_method" title="Mocha::Expectation#then (method)">Expectation#then</a></span>.</p>
+<p>Specify that an expected invocation should change the state of the state machine by using <span class='object_link'><a href="Expectation.html#then-instance_method" title="Mocha::Expectation#then (method)">Expectation#then</a></span>.</p>
-<p>Specify that an expected invocation should be constrained to occur within a
-particular <code>state</code> by using <span class='object_link'><a href="Expectation.html#when-instance_method" title="Mocha::Expectation#when (method)">Expectation#when</a></span>.</p>
+<p>Specify that an expected invocation should be constrained to occur within a particular <code>state</code> by using <span class='object_link'><a href="Expectation.html#when-instance_method" title="Mocha::Expectation#when (method)">Expectation#when</a></span>.</p>
 <p>A test can contain multiple state machines.</p>
@@ -643,12 +679,12 @@ particular <code>state</code> by using <span class='object_link'><a href="Expect
       <pre class="lines">
-174
-175
-176</pre>
+160
+161
+162</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 174</span>
+      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 160</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_states'>states</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='rparen'>)</span>
   <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_new_state_machine'>new_state_machine</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='rparen'>)</span>
@@ -662,11 +698,11 @@ particular <code>state</code> by using <span class='object_link'><a href="Expect
   <h3 class="signature " id="stub-instance_method">
-      <span class="overload">#<strong>stub</strong>(name, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>stub</strong>(name)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
-      <span class="overload">#<strong>stub</strong>(stubbed_methods_vs_return_values = {}, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>stub</strong>(stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
-      <span class="overload">#<strong>stub</strong>(name, stubbed_methods_vs_return_values = {}, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>stub</strong>(name, stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
@@ -698,24 +734,22 @@ particular <code>state</code> by using <span class='object_link'><a href="Expect
   <span class='comment'># an error will not be raised even if either Motor#start or Motor#stop has not been called
 </span><span class='kw'>end</span></code></pre>
+  </div>
+  <p class="tag_title">Overloads:</p>
+  <ul class="overload">
-        <p class="example_title"><div class='inline'>
-<p>Using the optional block to setup expectations &amp; stubbed methods
-[deprecated].</p>
-</div></p>
-      <pre class="example code"><code><span class='kw'>def</span> <span class='id identifier rubyid_test_motor_starts_and_stops'>test_motor_starts_and_stops</span>
-  <span class='id identifier rubyid_motor'>motor</span> <span class='op'>=</span> <span class='id identifier rubyid_stub'>stub</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>motor</span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span> <span class='kw'>do</span>
-    <span class='id identifier rubyid_expects'>expects</span><span class='lparen'>(</span><span class='symbol'>:start</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_with'>with</span><span class='lparen'>(</span><span class='int'>100</span><span class='period'>.</span><span class='id identifier rubyid_rpm'>rpm</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_returns'>returns</span><span class='lparen'>(</span><span class='kw'>true</span><span class='rparen'>)</span>
-    <span class='id identifier rubyid_stubs'>stubs</span><span class='lparen'>(</span><span class='symbol'>:stop</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_returns'>returns</span><span class='lparen'>(</span><span class='kw'>true</span><span class='rparen'>)</span>
-  <span class='kw'>end</span>
-  <span class='id identifier rubyid_assert'>assert</span> <span class='id identifier rubyid_motor'>motor</span><span class='period'>.</span><span class='id identifier rubyid_start'>start</span><span class='lparen'>(</span><span class='int'>100</span><span class='period'>.</span><span class='id identifier rubyid_rpm'>rpm</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_assert'>assert</span> <span class='id identifier rubyid_motor'>motor</span><span class='period'>.</span><span class='id identifier rubyid_stop'>stop</span>
-  <span class='comment'># an error will only be raised if Motor#start(100.rpm) has not been called
-</span><span class='kw'>end</span></code></pre>
+      <li class="overload_item">
+        <span class="signature">#<strong>stub</strong>(name)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
   </div>
-<p class="tag_title">Parameters:</p>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -723,7 +757,7 @@ particular <code>state</code> by using <span class='object_link'><a href="Expect
         <span class='name'>name</span>
-        <span class='type'>(<tt>String</tt>)</span>
+        <span class='type'>(<tt>String</tt>, <tt>Symbol</tt>)</span>
@@ -734,6 +768,25 @@ particular <code>state</code> by using <span class='object_link'><a href="Expect
     </li>
+</ul>
+</div>
+      </li>
+      <li class="overload_item">
+        <span class="signature">#<strong>stub</strong>(stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
         <span class='name'>stubbed_methods_vs_return_values</span>
@@ -742,68 +795,59 @@ particular <code>state</code> by using <span class='object_link'><a href="Expect
         <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
         &mdash;
         <div class='inline'>
-<p>stubbed method name symbols as keys and corresponding return values as
-values - these stubbed methods are setup as if <span class='object_link'><a href="Mock.html#stubs-instance_method" title="Mocha::Mock#stubs (method)">Mock#stubs</a></span> were called
-multiple times.</p>
+<p>stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if <span class='object_link'><a href="Mock.html#stubs-instance_method" title="Mocha::Mock#stubs (method)">Mock#stubs</a></span> were called multiple times.</p>
 </div>
     </li>
 </ul>
-<p class="tag_title">Yields:</p>
-<ul class="yield">
-    <li>
-        <span class='type'></span>
-        <div class='inline'>
-<p>optional block to be evaluated in the context of the mock object instance,
-giving an alternative way to setup stubbed methods.</p>
 </div>
+      </li>
-    </li>
-    <li>
-        <span class='type'></span>
-        <div class='inline'>
-<p>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.</p>
+      <li class="overload_item">
+        <span class="signature">#<strong>stub</strong>(name, stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
 </div>
-    </li>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
+        <span class='name'>name</span>
-        <span class='type'></span>
+        <span class='type'>(<tt>String</tt>, <tt>Symbol</tt>)</span>
+        &mdash;
         <div class='inline'>
-<p>deprecated: use Object#tap or define stubs/expectations with an explicit
-receiver instead.</p>
+<p>identifies mock object in error messages.</p>
 </div>
     </li>
 </ul>
+</div>
+      </li>
+  </ul>
 <p class="tag_title">Returns:</p>
 <ul class="return">
@@ -829,23 +873,15 @@ receiver instead.</p>
       <pre class="lines">
-91
-92
-93
-94
-95
-96
-97</pre>
+84
+85
+86</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 91</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_stub'>stub</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_arguments'>arguments</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_name'>name</span> <span class='op'>=</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_shift'>shift</span> <span class='kw'>if</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>String</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_expectations'>expectations</span> <span class='op'>=</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_shift'>shift</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
-  <span class='id identifier rubyid_stub'>stub</span> <span class='op'>=</span> <span class='id identifier rubyid_name'>name</span> <span class='op'>?</span> <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_named_mock'>named_mock</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span> <span class='op'>:</span> <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_unnamed_mock'>unnamed_mock</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_stub'>stub</span><span class='period'>.</span><span class='id identifier rubyid_stubs'>stubs</span><span class='lparen'>(</span><span class='id identifier rubyid_expectations'>expectations</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_stub'>stub</span>
+      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 84</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_stub'>stub</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_arguments'>arguments</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_create_mock'>create_mock</span><span class='lparen'>(</span><span class='id identifier rubyid_arguments'>arguments</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_stub'>stub</span><span class='comma'>,</span> <span class='id identifier rubyid_expectations'>expectations</span><span class='op'>|</span> <span class='id identifier rubyid_stub'>stub</span><span class='period'>.</span><span class='id identifier rubyid_stubs'>stubs</span><span class='lparen'>(</span><span class='id identifier rubyid_expectations'>expectations</span><span class='rparen'>)</span> <span class='rbrace'>}</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -856,11 +892,11 @@ receiver instead.</p>
   <h3 class="signature " id="stub_everything-instance_method">
-      <span class="overload">#<strong>stub_everything</strong>(name, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>stub_everything</strong>(name)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
-      <span class="overload">#<strong>stub_everything</strong>(stubbed_methods_vs_return_values = {}, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>stub_everything</strong>(stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
-      <span class="overload">#<strong>stub_everything</strong>(name, stubbed_methods_vs_return_values = {}, &amp;block)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+      <span class="overload">#<strong>stub_everything</strong>(name, stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
@@ -870,8 +906,7 @@ receiver instead.</p>
 </h3><div class="docstring">
   <div class="discussion">
-<p>Builds a mock object that accepts calls to any method. By default it will
-return <code>nil</code> for any method call.</p>
+<p>Builds a mock object that accepts calls to any method. By default it will return <code>nil</code> for any method call.</p>
   </div>
@@ -894,7 +929,21 @@ return <code>nil</code> for any method call.</p>
 <span class='kw'>end</span></code></pre>
   </div>
-<p class="tag_title">Parameters:</p>
+  <p class="tag_title">Overloads:</p>
+  <ul class="overload">
+      <li class="overload_item">
+        <span class="signature">#<strong>stub_everything</strong>(name)  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -902,7 +951,7 @@ return <code>nil</code> for any method call.</p>
         <span class='name'>name</span>
-        <span class='type'>(<tt>String</tt>)</span>
+        <span class='type'>(<tt>String</tt>, <tt>Symbol</tt>)</span>
@@ -913,6 +962,25 @@ return <code>nil</code> for any method call.</p>
     </li>
+</ul>
+</div>
+      </li>
+      <li class="overload_item">
+        <span class="signature">#<strong>stub_everything</strong>(stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
         <span class='name'>stubbed_methods_vs_return_values</span>
@@ -921,68 +989,77 @@ return <code>nil</code> for any method call.</p>
         <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
         &mdash;
         <div class='inline'>
-<p>stubbed method name symbols as keys and corresponding return values as
-values - these stubbed methods are setup as if <span class='object_link'><a href="Mock.html#stubs-instance_method" title="Mocha::Mock#stubs (method)">Mock#stubs</a></span> were called
-multiple times.</p>
+<p>stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if <span class='object_link'><a href="Mock.html#stubs-instance_method" title="Mocha::Mock#stubs (method)">Mock#stubs</a></span> were called multiple times.</p>
 </div>
     </li>
 </ul>
-<p class="tag_title">Yields:</p>
-<ul class="yield">
-    <li>
-        <span class='type'></span>
-        <div class='inline'>
-<p>optional block to be evaluated in the context of the mock object instance,
-giving an alternative way to setup stubbed methods.</p>
 </div>
+      </li>
-    </li>
+      <li class="overload_item">
+        <span class="signature">#<strong>stub_everything</strong>(name, stubbed_methods_vs_return_values = {})  &#x21d2; <tt><span class='object_link'><a href="Mock.html" title="Mocha::Mock (class)">Mock</a></span></tt> </span>
+        <div class="docstring">
+  <div class="discussion">
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
+        <span class='name'>name</span>
-        <span class='type'></span>
+        <span class='type'>(<tt>String</tt>, <tt>Symbol</tt>)</span>
+        &mdash;
         <div class='inline'>
-<p>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.</p>
+<p>identifies mock object in error messages.</p>
 </div>
     </li>
     <li>
+        <span class='name'>stubbed_methods_vs_return_values</span>
-        <span class='type'></span>
+        <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
+        &mdash;
         <div class='inline'>
-<p>deprecated: use Object#tap or define stubs/expectations with an explicit
-receiver instead.</p>
+<p>stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if <span class='object_link'><a href="Mock.html#stubs-instance_method" title="Mocha::Mock#stubs (method)">Mock#stubs</a></span> were called multiple times.</p>
 </div>
     </li>
 </ul>
+</div>
+      </li>
+  </ul>
 <p class="tag_title">Returns:</p>
 <ul class="return">
@@ -1008,25 +1085,21 @@ receiver instead.</p>
       <pre class="lines">
-119
-120
-121
-122
-123
-124
-125
-126</pre>
+107
+108
+109
+110
+111
+112</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 119</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_stub_everything'>stub_everything</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_arguments'>arguments</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_name'>name</span> <span class='op'>=</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_shift'>shift</span> <span class='kw'>if</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>String</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_expectations'>expectations</span> <span class='op'>=</span> <span class='id identifier rubyid_arguments'>arguments</span><span class='period'>.</span><span class='id identifier rubyid_shift'>shift</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
-  <span class='id identifier rubyid_stub'>stub</span> <span class='op'>=</span> <span class='id identifier rubyid_name'>name</span> <span class='op'>?</span> <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_named_mock'>named_mock</span><span class='lparen'>(</span><span class='id identifier rubyid_name'>name</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span> <span class='op'>:</span> <span class='const'>Mockery</span><span class='period'>.</span><span class='id identifier rubyid_instance'>instance</span><span class='period'>.</span><span class='id identifier rubyid_unnamed_mock'>unnamed_mock</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_stub'>stub</span><span class='period'>.</span><span class='id identifier rubyid_stub_everything'>stub_everything</span>
-  <span class='id identifier rubyid_stub'>stub</span><span class='period'>.</span><span class='id identifier rubyid_stubs'>stubs</span><span class='lparen'>(</span><span class='id identifier rubyid_expectations'>expectations</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_stub'>stub</span>
+      <pre class="code"><span class="info file"># File 'lib/mocha/api.rb', line 107</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_stub_everything'>stub_everything</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_arguments'>arguments</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_create_mock'>create_mock</span><span class='lparen'>(</span><span class='id identifier rubyid_arguments'>arguments</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_stub'>stub</span><span class='comma'>,</span> <span class='id identifier rubyid_expectations'>expectations</span><span class='op'>|</span>
+    <span class='id identifier rubyid_stub'>stub</span><span class='period'>.</span><span class='id identifier rubyid_stub_everything'>stub_everything</span>
+    <span class='id identifier rubyid_stub'>stub</span><span class='period'>.</span><span class='id identifier rubyid_stubs'>stubs</span><span class='lparen'>(</span><span class='id identifier rubyid_expectations'>expectations</span><span class='rparen'>)</span>
+  <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1046,9 +1119,9 @@ receiver instead.</p>
 </div>
       <div id="footer">
-  Generated on Mon Jun 17 18:38:43 2019 by
+  Generated on Sun Nov 24 15:26:49 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.19 (ruby-2.5.3).
+  0.9.20 (ruby-2.6.5).
 </div>
     </div>