RubyGems - mocha - Versions diffs - 1.9.0 → 1.11.1 - Mend

mocha 1.9.0 → 1.11.1

Files changed (215) hide show

checksums.yaml +4 -4
data/.github/FUNDING.yml +1 -0
data/.rubocop.yml +3 -0
data/.rubocop_todo.yml +7 -30
data/.yardopts +1 -0
data/README.md +30 -11
data/RELEASE.md +93 -0
data/Rakefile +10 -7
data/docs/CNAME +1 -0
data/docs/Mocha.html +132 -5
data/docs/Mocha/API.html +437 -206
data/docs/Mocha/ClassMethods.html +13 -16
data/docs/Mocha/Configuration.html +1126 -227
data/docs/Mocha/Expectation.html +420 -267
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 +36 -14
data/docs/file.RELEASE.html +126 -3
data/docs/frames.html +1 -1
data/docs/index.html +36 -14
data/docs/method_list.html +117 -37
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 +120 -56
data/lib/mocha/block_matcher.rb +31 -0
data/lib/mocha/cardinality.rb +26 -11
data/lib/mocha/class_methods.rb +17 -15
data/lib/mocha/configuration.rb +351 -67
data/lib/mocha/deprecation.rb +2 -1
data/lib/mocha/detection/test_unit.rb +1 -3
data/lib/mocha/exception_raiser.rb +2 -1
data/lib/mocha/expectation.rb +102 -63
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 +77 -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 +25 -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/lib/mocha/yield_parameters.rb +5 -11
data/mocha.gemspec +1 -3
data/test/acceptance/acceptance_test_helper.rb +7 -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 +16 -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_built_with_first_argument_type_being_string_test.rb +98 -0
data/test/acceptance/mock_test.rb +63 -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/multiple_yielding_test.rb +59 -0
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 +27 -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/acceptance/yielding_test.rb +80 -0
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 +115 -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
data/test/unit/yield_parameters_test.rb +35 -53
metadata +19 -34
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/multiple_yields.rb +0 -15
data/lib/mocha/no_yields.rb +0 -5
data/lib/mocha/parameter_matchers/object.rb +0 -15
data/lib/mocha/single_yield.rb +0 -13
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
data/test/unit/multiple_yields_test.rb +0 -16
data/test/unit/no_yields_test.rb +0 -16
data/test/unit/single_yield_test.rb +0 -16

@@ -6,7 +6,7 @@
 <title>
   File: README
-    &mdash; Mocha 1.9.0
+    &mdash; Mocha 1.11.1
 </title>
@@ -62,12 +62,16 @@
 <h3>Description</h3>
 <ul>
-<li>A Ruby library for mocking and stubbing.</li>
+<li>A Ruby library for <a href="http://xunitpatterns.com/Mock%20Object.html">mocking</a> and <a href="http://xunitpatterns.com/Test%20Stub.html">stubbing</a> - but deliberately not (yet) <a href="http://xunitpatterns.com/Fake%20Object.html">faking</a> or <a href="http://xunitpatterns.com/Test%20Spy.html">spying</a>.</li>
 <li>A unified, simple and readable syntax for both full &amp; partial mocking.</li>
 <li>Built-in support for MiniTest and Test::Unit.</li>
 <li>Supported by many other test frameworks.</li>
 </ul>
+<h3>Intended Usage</h3>
+<p>Mocha is intended to be used in unit tests for the <a href="http://xunitpatterns.com/Mock%20Object.html">Mock Object</a> or <a href="http://xunitpatterns.com/Test%20Stub.html">Test Stub</a> types of <a href="http://xunitpatterns.com/Test%20Double.html">Test Double</a>, not the <a href="http://xunitpatterns.com/Fake%20Object.html">Fake Object</a> or <a href="http://xunitpatterns.com/Test%20Spy.html">Test Spy</a> 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.</p>
 <h3>Installation</h3>
 <h4>Gem</h4>
@@ -147,31 +151,40 @@
 <p>Note: There is no need to use a require statement to setup Mocha; RSpec does this itself.</p>
-<h4>Rails Plugin</h4>
-<p>Install the Rails plugin...</p>
+<h5>MiniTest</h5>
-<pre class="code ruby"><code class="ruby">$ rails plugin install git://github.com/freerange/mocha.git
+<pre class="code ruby"><code class="ruby"><span class='comment'># At bottom of test_helper.rb (or at least after `require &#39;rails/test_help&#39;`)
+</span><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>mocha/minitest</span><span class='tstring_end'>&#39;</span></span>
 </code></pre>
-<p>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 <code>test_helper.rb</code>.</p>
+<h5>Cucumber</h5>
-<h5>MiniTest</h5>
+<pre class="code ruby"><code class="ruby"><span class='comment'># In e.g. features/support/mocha.rb
+</span><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>mocha/api</span><span class='tstring_end'>&#39;</span></span>
-<pre class="code ruby"><code class="ruby"><span class='comment'># At bottom of test_helper.rb (or at least after `require &#39;rails/test_help&#39;`)
-</span><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>mocha/minitest</span><span class='tstring_end'>&#39;</span></span>
+<span class='const'>World</span><span class='lparen'>(</span><span class='const'><span class='object_link'><a href="Mocha.html" title="Mocha (module)">Mocha</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Mocha/API.html" title="Mocha::API (module)">API</a></span></span><span class='rparen'>)</span>
+<span class='const'>Around</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_scenario'>scenario</span><span class='comma'>,</span> <span class='id identifier rubyid_block'>block</span><span class='op'>|</span>
+  <span class='kw'>begin</span>
+    <span class='id identifier rubyid_mocha_setup'>mocha_setup</span>
+    <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_call'>call</span>
+    <span class='id identifier rubyid_mocha_verify'>mocha_verify</span>
+  <span class='kw'>ensure</span>
+    <span class='id identifier rubyid_mocha_teardown'>mocha_teardown</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span>
 </code></pre>
 <h4>Known Issues</h4>
 <ul>
+<li>In Mocha v1.10.0 an undocumented feature of <code>API#mock</code>, <code>API#stub</code> &amp; <code>API#stub_everything</code> was changed. Previously when these methods were passed a single symbol, they returned a mock object that responded to the method identified by the symbol. Now Passing a single symbol is equivalent to passing a single string, i.e. it now defines the &quot;name&quot; of the mock object.</li>
 <li>In Mocha v1.2.0 there is a scenario where stubbing a class method originally defined in a module hangs the Ruby interpreter due to <a href="https://bugs.ruby-lang.org/issues/12832">a bug in Ruby v2.3.1</a>. See #272. This was fixed in Mocha v1.2.1.</li>
 <li>Since v1.1.0 Mocha has used prepended modules internally for stubbing methods. There is <a href="https://bugs.ruby-lang.org/issues/12876">an obscure Ruby bug</a> in many (but not all) versions of Ruby between v2.0 &amp; v2.3 which under certain circumstances may cause your Ruby interpreter to hang. See the Ruby bug report for more details. The bug has been fixed in Ruby v2.3.3 &amp; v2.4.0.</li>
 <li>Stubbing an aliased class method, where the original method is defined in a module that&#39;s used to <code>extend</code> the class doesn&#39;t work in Ruby 1.8.x. See stub_method_defined_on_module_and_aliased_test.rb for an example of this behaviour.</li>
 <li>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 &amp; 3.0.0-3.0.19.</li>
 <li>0.11.x versions don&#39;t work with Rails 3.2.13 (<code>TypeError: superclass mismatch for class ExpectationError</code>). See #115.</li>
 <li>Versions 0.10.2, 0.10.3 &amp; 0.11.0 of the Mocha gem were broken. Please do not use these versions.</li>
-<li>Versions 0.9.6 &amp; 0.9.7 of the Mocha Rails plugin were broken. Please do not use these versions.</li>
 </ul>
 <h3>Usage</h3>
@@ -341,6 +354,15 @@
 <p>See the <a href="https://mocha.jamesmead.org/Mocha/Configuration.html">documentation</a> for <code>Mocha::Configuration</code> for further details.</p>
+<h5>MOCHA_OPTIONS</h5>
+<p><code>MOCHA_OPTIONS</code> is an environment variable whose value can be set to a comma-separated list, so that we can specify multiple options e.g. <code>MOCHA_OPTIONS=debug,use_test_unit_gem</code>.
+Only the following values are currently recognized and have an effect:</p>
+<ul>
+<li><code>debug</code>: 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.</li>
+</ul>
 <h3>Useful Links</h3>
 <ul>
@@ -367,7 +389,7 @@
 <li>Commit &amp; push to GitHub</li>
 <li><p>Check Travis CI build is passing - <a href="https://travis-ci.org/freerange/mocha">https://travis-ci.org/freerange/mocha</a></p></li>
 <li><p>Sign in to Google Analytics - <a href="https://analytics.google.com/analytics/web/">https://analytics.google.com/analytics/web/</a></p></li>
-<li><p>Find the web property ID for Go Free Range Ltd &gt; Mocha Documentation (UA-625523-7)</p></li>
+<li><p>Find the web property ID for floehopper (625523) &gt; Mocha Documentation (UA-625523-7)</p></li>
 <li><p>Generate documentation:</p></li>
 </ul>
@@ -416,9 +438,9 @@ Pushed mocha 1.2.0 to rubygems.org.
 </div>
       <div id="footer">
-  Generated on Mon Jun 17 18:38:43 2019 by
+  Generated on Tue Dec 17 12:49:34 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/file.RELEASE.html CHANGED

@@ -6,7 +6,7 @@
 <title>
   File: RELEASE
-    &mdash; Mocha 1.9.0
+    &mdash; Mocha 1.11.1
 </title>
@@ -59,6 +59,129 @@
       <div id="content"><div id='filecontents'><h1>Release Notes</h1>
+<h2>1.11.1</h2>
+<h3>External changes</h3>
+<ul>
+<li>The <code>reinstate_undocumented_behaviour_from_v1_9</code> configuration option is now enabled by default to give people a chance to see and fix the relevant deprecation warnings before the behaviour is removed in a future release (b91b1c9e)</li>
+</ul>
+<h2>1.11.0</h2>
+<h3>External changes</h3>
+<ul>
+<li>Add <code>Expectation#with_block_given</code> &amp; <code>Expectation#with_no_block_given</code> (#441).
+<ul>
+<li>Allows non-deprecated solution for #382. Thanks to @yemartin for reporting and to @techbelly &amp; @nitishr for feedback.</li>
+</ul></li>
+<li>Fix issue with non-Array arguments passed to <code>Expectation#multiple_yields</code> (#444).
+<ul>
+<li>The undocumented behaviour is now properly supported and documented.</li>
+</ul></li>
+</ul>
+<h3>Internal changes</h3>
+<ul>
+<li>Move static YARD options from Rake task to <code>.yardopts</code> file - thanks to @nitishr (#429)</li>
+<li>Simplify implementation of yielding functionality - thanks to @nitishr (#439)</li>
+<li>Add missing require statement to <code>acceptance_test_helper.rb</code> (1070fc02)</li>
+<li>Add some baseline acceptance tests for yielding behaviour (c2cac911)</li>
+<li>Display a sponsor button on GitHub repo page (9fc5911b)</li>
+<li>Use new Deprecation.warning behaviour in <code>Invocation#call</code> (932d1166)</li>
+</ul>
+<h2>1.10.2</h2>
+<ul>
+<li>Optionally reinstate undocumented behaviour from v1.9. This introduces a new configuration option (<code>reinstate_undocumented_behaviour_from_v1_9</code>) to reinstate a couple of bits of undocumented behaviour from v1.9 which were changed in v1.10 without any prior deprecation warning (#438):
+<ul>
+<li>The behaviour of <code>API#mock</code>, <code>API#stub</code> and <code>API#stub_everything</code> when called with a symbol as the first argument.</li>
+<li>The behaviour of <code>Expectation#yields</code> and <code>Expectation#multiple_yields</code> when the stubbed method is called without a block.</li>
+</ul></li>
+</ul>
+<h2>1.10.1</h2>
+<ul>
+<li>Ensure ObjectMethods &amp; ClassMethods included when API extended (43778756)</li>
+<li>Fix regression in <code>any_instance</code> stubbing of methods on object which has an implementation of <code>#respond_to?</code> that depends on the object&#39;s internal state - thanks to @rafaelfranca for reporting &amp; @nitishr for fixing (#432, #434, 469d4b17)</li>
+</ul>
+<h2>1.10.0</h2>
+<ul>
+<li>Improve deprecation warning when requiring &#39;mocha/setup&#39; (388f44d7)</li>
+<li>Add documentation for Cucumber integration (13ab797b)</li>
+<li>Add documentation about an undocumented feature of <code>API#mock</code>, <code>API#stub</code> &amp; <code>API#stub_everything</code> being changed (7ed2e4e7, d30c1717)</li>
+</ul>
+<h2>1.10.0.beta.1</h2>
+<ul>
+<li>Hide <code>ClassMethods#method_visibility</code> &amp; <code>#method_exists?</code> methods to avoid clash with Rails (#428)</li>
+</ul>
+<h2>1.10.0.alpha</h2>
+<h3>External changes</h3>
+<ul>
+<li>Remove dependency on metaclass gem (#49, #365)</li>
+<li>Accept symbol (as well as a string) as mock/stub name - thanks to @nitishr (#347, #353, #377)</li>
+<li>More realistic examples in documentation for <code>Expectation#yields</code> and <code>#multiple_yields</code> - thanks to @nitishr (#352, #383)</li>
+<li>Improve documentation for <code>Mock#responds_like</code> &amp; <code>#responds_like_instance_of</code> - thanks to @nitishr (#337, #384)</li>
+<li>Make <code>Expectation#yields</code> &amp; <code>Expectation#multiple_yields</code> 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&#39;s behaviour. If this causes your tests to fail, then fix it by removing the unnecessary call to <code>Expectation#yields</code> or <code>Expectation#multiple_yields</code> - thanks to @nitishr (#382)</li>
+<li>Document <code>MOCHA_OPTIONS</code> in README - thanks to @nitishr (#311, #386)</li>
+<li>Add documentation to explain how Mocha is intended to be used - thanks to @nitishr (#330, #385)</li>
+<li>Deprecation warning if integration using &#39;mocha/test_unit&#39; or &#39;mocha/minitest&#39; fails - thanks to @nitishr (#229, #389, c6032d0b)</li>
+<li>Require at least one specified sequence for <code>Expectation#in_sequence</code> - thanks to @nitishr (#79, #396, 9020248a)</li>
+<li>Make signatures of <code>Mock#unstub</code> &amp; <code>ObjectMethods#unstub</code> consistent - thanks to @nitishr (#397, f04d437)</li>
+<li>Deprecate requiring &#39;mocha/setup&#39; (36adf880)</li>
+<li>Optionally display matching invocations alongside expectations - thanks to @nitishr (#178, #394, 00f0540, #410)</li>
+<li>Put deprecations into effect (#400, #418):
+<ul>
+<li>Remove deprecated &#39;mocha_standalone.rb&#39; &amp; &#39;mocha/standalone.rb&#39;</li>
+<li>Fail fast if no test library loaded</li>
+<li>Removed optional block for <code>Mocha::API#mock</code>, <code>#stub</code> &amp; <code>#stub_everything</code></li>
+<li>Remove deprecated <code>ParameterMatchers#has_equivalent_query_string</code> method</li>
+<li>Remove deprecated &#39;mocha/mini_test.rb&#39;</li>
+</ul></li>
+<li>Fix typo in docs for <code>Mocha::Configuration.prevent</code> (266ce71c)</li>
+<li>New-style configuration (see documentation for <code>Mocha::Configuration</code>) (#407, #421)</li>
+<li>Deprecate support for Ruby versions earlier than v1.9 (#325, c5f8496d)</li>
+<li>Deprecate support for versions of test-unit &amp; minitest which need monkey-patching (a34e1a88)</li>
+<li>Deprecate old-style Rails plugin (#403, 2df77134)</li>
+<li>Documentation fixes &amp; improvements which also fix YARD warnings (472d5416, a2c0d64a)</li>
+</ul>
+<h3>Internal changes</h3>
+<ul>
+<li>Pin minitest to v5.11.3 for Ruby v1.8.7 to fix build; minitest no longer supports Ruby v1.8.7 (4a0a580)</li>
+<li>Upgrade JRuby to v9.2.8.0 in Travis CI builds (aa29b3f)</li>
+<li>Only run rubocop for MRI Ruby versions &amp; non-integration test builds (8f1c6af)</li>
+<li>Reduce duplication in any instance method class - thanks to @nitishr (#378)</li>
+<li>Simplify <code>AnyInstanceMethod</code>, <code>ClassMethod</code>, <code>InstanceMethod</code>, <code>ModuleMethod</code> class hierarchy - thanks to @nitishr (#381)</li>
+<li>Simplify <code>ClassMethods#method_exists?</code> &amp; <code>ObjectMethods#method_exists?</code> making them consistent - thanks to @nitishr (#270, #362, #370)</li>
+<li>Don&#39;t override definition of <code>singleton_class</code> in <code>ClassMethods</code> - thanks to @nitishr (#391, #392)</li>
+<li>Do not include &#39;method_definer&#39; methods into all objects (#268, #402)</li>
+<li>Distinguish different <code>ObjectMethods</code> modules (#268, #404)</li>
+<li>Pass invocation to expectation list methods - thanks to @nitishr (#408, #409, #411)</li>
+<li>Consistently use <code>assert_raises</code> - thanks to @nitishr (#405, #412, a66b7bed)</li>
+<li>Update Ruby &amp; JRuby versions in Travis CI config (18cb1a93, eb061c53)</li>
+<li>Rubocop improvements (aa16ea67...6f4db70b, 2a1240e6...e95716ae)</li>
+<li>Fix inconsistency in CardinalityTest (aa10e0a8)</li>
+<li>Fix test failures on Mac OSX Catalina - thanks to @nitishr (#413, #417, #419, 8a0f2535)</li>
+<li>Remove default argument in <code>Expectation#invoke</code> - thanks to @nitishr (#414, #420)</li>
+</ul>
 <h2>1.9.0</h2>
 <ul>
@@ -877,9 +1000,9 @@ Hash with wrong number of entries.</li>
 </div>
       <div id="footer">
-  Generated on Mon Jun 17 18:38:43 2019 by
+  Generated on Tue Dec 17 12:49:34 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/frames.html CHANGED

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-	<title>Mocha 1.9.0</title>
+	<title>Mocha 1.11.1</title>
 </head>
 <script type="text/javascript" charset="utf-8">
   var match = unescape(window.location.hash).match(/^#!(.+)/);

data/docs/index.html CHANGED

@@ -6,7 +6,7 @@
 <title>
   File: README
-    &mdash; Mocha 1.9.0
+    &mdash; Mocha 1.11.1
 </title>
@@ -62,12 +62,16 @@
 <h3>Description</h3>
 <ul>
-<li>A Ruby library for mocking and stubbing.</li>
+<li>A Ruby library for <a href="http://xunitpatterns.com/Mock%20Object.html">mocking</a> and <a href="http://xunitpatterns.com/Test%20Stub.html">stubbing</a> - but deliberately not (yet) <a href="http://xunitpatterns.com/Fake%20Object.html">faking</a> or <a href="http://xunitpatterns.com/Test%20Spy.html">spying</a>.</li>
 <li>A unified, simple and readable syntax for both full &amp; partial mocking.</li>
 <li>Built-in support for MiniTest and Test::Unit.</li>
 <li>Supported by many other test frameworks.</li>
 </ul>
+<h3>Intended Usage</h3>
+<p>Mocha is intended to be used in unit tests for the <a href="http://xunitpatterns.com/Mock%20Object.html">Mock Object</a> or <a href="http://xunitpatterns.com/Test%20Stub.html">Test Stub</a> types of <a href="http://xunitpatterns.com/Test%20Double.html">Test Double</a>, not the <a href="http://xunitpatterns.com/Fake%20Object.html">Fake Object</a> or <a href="http://xunitpatterns.com/Test%20Spy.html">Test Spy</a> 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.</p>
 <h3>Installation</h3>
 <h4>Gem</h4>
@@ -147,31 +151,40 @@
 <p>Note: There is no need to use a require statement to setup Mocha; RSpec does this itself.</p>
-<h4>Rails Plugin</h4>
-<p>Install the Rails plugin...</p>
+<h5>MiniTest</h5>
-<pre class="code ruby"><code class="ruby">$ rails plugin install git://github.com/freerange/mocha.git
+<pre class="code ruby"><code class="ruby"><span class='comment'># At bottom of test_helper.rb (or at least after `require &#39;rails/test_help&#39;`)
+</span><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>mocha/minitest</span><span class='tstring_end'>&#39;</span></span>
 </code></pre>
-<p>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 <code>test_helper.rb</code>.</p>
+<h5>Cucumber</h5>
-<h5>MiniTest</h5>
+<pre class="code ruby"><code class="ruby"><span class='comment'># In e.g. features/support/mocha.rb
+</span><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>mocha/api</span><span class='tstring_end'>&#39;</span></span>
-<pre class="code ruby"><code class="ruby"><span class='comment'># At bottom of test_helper.rb (or at least after `require &#39;rails/test_help&#39;`)
-</span><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>mocha/minitest</span><span class='tstring_end'>&#39;</span></span>
+<span class='const'>World</span><span class='lparen'>(</span><span class='const'><span class='object_link'><a href="Mocha.html" title="Mocha (module)">Mocha</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Mocha/API.html" title="Mocha::API (module)">API</a></span></span><span class='rparen'>)</span>
+<span class='const'>Around</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_scenario'>scenario</span><span class='comma'>,</span> <span class='id identifier rubyid_block'>block</span><span class='op'>|</span>
+  <span class='kw'>begin</span>
+    <span class='id identifier rubyid_mocha_setup'>mocha_setup</span>
+    <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_call'>call</span>
+    <span class='id identifier rubyid_mocha_verify'>mocha_verify</span>
+  <span class='kw'>ensure</span>
+    <span class='id identifier rubyid_mocha_teardown'>mocha_teardown</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span>
 </code></pre>
 <h4>Known Issues</h4>
 <ul>
+<li>In Mocha v1.10.0 an undocumented feature of <code>API#mock</code>, <code>API#stub</code> &amp; <code>API#stub_everything</code> was changed. Previously when these methods were passed a single symbol, they returned a mock object that responded to the method identified by the symbol. Now Passing a single symbol is equivalent to passing a single string, i.e. it now defines the &quot;name&quot; of the mock object.</li>
 <li>In Mocha v1.2.0 there is a scenario where stubbing a class method originally defined in a module hangs the Ruby interpreter due to <a href="https://bugs.ruby-lang.org/issues/12832">a bug in Ruby v2.3.1</a>. See #272. This was fixed in Mocha v1.2.1.</li>
 <li>Since v1.1.0 Mocha has used prepended modules internally for stubbing methods. There is <a href="https://bugs.ruby-lang.org/issues/12876">an obscure Ruby bug</a> in many (but not all) versions of Ruby between v2.0 &amp; v2.3 which under certain circumstances may cause your Ruby interpreter to hang. See the Ruby bug report for more details. The bug has been fixed in Ruby v2.3.3 &amp; v2.4.0.</li>
 <li>Stubbing an aliased class method, where the original method is defined in a module that&#39;s used to <code>extend</code> the class doesn&#39;t work in Ruby 1.8.x. See stub_method_defined_on_module_and_aliased_test.rb for an example of this behaviour.</li>
 <li>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 &amp; 3.0.0-3.0.19.</li>
 <li>0.11.x versions don&#39;t work with Rails 3.2.13 (<code>TypeError: superclass mismatch for class ExpectationError</code>). See #115.</li>
 <li>Versions 0.10.2, 0.10.3 &amp; 0.11.0 of the Mocha gem were broken. Please do not use these versions.</li>
-<li>Versions 0.9.6 &amp; 0.9.7 of the Mocha Rails plugin were broken. Please do not use these versions.</li>
 </ul>
 <h3>Usage</h3>
@@ -341,6 +354,15 @@
 <p>See the <a href="https://mocha.jamesmead.org/Mocha/Configuration.html">documentation</a> for <code>Mocha::Configuration</code> for further details.</p>
+<h5>MOCHA_OPTIONS</h5>
+<p><code>MOCHA_OPTIONS</code> is an environment variable whose value can be set to a comma-separated list, so that we can specify multiple options e.g. <code>MOCHA_OPTIONS=debug,use_test_unit_gem</code>.
+Only the following values are currently recognized and have an effect:</p>
+<ul>
+<li><code>debug</code>: 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.</li>
+</ul>
 <h3>Useful Links</h3>
 <ul>
@@ -367,7 +389,7 @@
 <li>Commit &amp; push to GitHub</li>
 <li><p>Check Travis CI build is passing - <a href="https://travis-ci.org/freerange/mocha">https://travis-ci.org/freerange/mocha</a></p></li>
 <li><p>Sign in to Google Analytics - <a href="https://analytics.google.com/analytics/web/">https://analytics.google.com/analytics/web/</a></p></li>
-<li><p>Find the web property ID for Go Free Range Ltd &gt; Mocha Documentation (UA-625523-7)</p></li>
+<li><p>Find the web property ID for floehopper (625523) &gt; Mocha Documentation (UA-625523-7)</p></li>
 <li><p>Generate documentation:</p></li>
 </ul>
@@ -416,9 +438,9 @@ Pushed mocha 1.2.0 to rubygems.org.
 </div>
       <div id="footer">
-  Generated on Mon Jun 17 18:38:42 2019 by
+  Generated on Tue Dec 17 12:49:34 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/method_list.html CHANGED

@@ -68,7 +68,7 @@
   </li>
-  <li class="even ">
+  <li class="even deprecated">
     <div class="item">
       <span class='object_link'><a href="Mocha/Configuration.html#allow-class_method" title="Mocha::Configuration.allow (method)">allow</a></span>
       <small>Mocha::Configuration</small>
@@ -148,6 +148,22 @@
   </li>
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha.html#configure-class_method" title="Mocha.configure (method)">configure</a></span>
+      <small>Mocha</small>
+    </div>
+  </li>
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#display_matching_invocations_on_failure=-instance_method" title="Mocha::Configuration#display_matching_invocations_on_failure= (method)">#display_matching_invocations_on_failure=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#equals-instance_method" title="Mocha::ParameterMatchers#equals (method)">#equals</a></span>
@@ -204,15 +220,7 @@
   </li>
-  <li class="odd deprecated">
-    <div class="item">
-      <span class='object_link'><a href="Mocha/ParameterMatchers.html#has_equivalent_query_string-instance_method" title="Mocha::ParameterMatchers#has_equivalent_query_string (method)">#has_equivalent_query_string</a></span>
-      <small>Mocha::ParameterMatchers</small>
-    </div>
-  </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#has_key-instance_method" title="Mocha::ParameterMatchers#has_key (method)">#has_key</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -220,7 +228,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#has_value-instance_method" title="Mocha::ParameterMatchers#has_value (method)">#has_value</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -228,7 +236,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Expectation.html#in_sequence-instance_method" title="Mocha::Expectation#in_sequence (method)">#in_sequence</a></span>
       <small>Mocha::Expectation</small>
@@ -236,7 +244,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#includes-instance_method" title="Mocha::ParameterMatchers#includes (method)">#includes</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -244,7 +252,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#instance_of-instance_method" title="Mocha::ParameterMatchers#instance_of (method)">#instance_of</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -252,7 +260,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/StateMachine.html#is-instance_method" title="Mocha::StateMachine#is (method)">#is</a></span>
       <small>Mocha::StateMachine</small>
@@ -260,7 +268,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#is_a-instance_method" title="Mocha::ParameterMatchers#is_a (method)">#is_a</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -268,7 +276,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/StateMachine.html#is_not-instance_method" title="Mocha::StateMachine#is_not (method)">#is_not</a></span>
       <small>Mocha::StateMachine</small>
@@ -276,7 +284,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#kind_of-instance_method" title="Mocha::ParameterMatchers#kind_of (method)">#kind_of</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -284,7 +292,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Hooks.html#mocha_setup-instance_method" title="Mocha::Hooks#mocha_setup (method)">#mocha_setup</a></span>
       <small>Mocha::Hooks</small>
@@ -292,7 +300,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Hooks.html#mocha_teardown-instance_method" title="Mocha::Hooks#mocha_teardown (method)">#mocha_teardown</a></span>
       <small>Mocha::Hooks</small>
@@ -300,7 +308,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Hooks.html#mocha_verify-instance_method" title="Mocha::Hooks#mocha_verify (method)">#mocha_verify</a></span>
       <small>Mocha::Hooks</small>
@@ -308,7 +316,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/API.html#mock-instance_method" title="Mocha::API#mock (method)">#mock</a></span>
       <small>Mocha::API</small>
@@ -316,7 +324,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Expectation.html#multiple_yields-instance_method" title="Mocha::Expectation#multiple_yields (method)">#multiple_yields</a></span>
       <small>Mocha::Expectation</small>
@@ -324,7 +332,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Expectation.html#never-instance_method" title="Mocha::Expectation#never (method)">#never</a></span>
       <small>Mocha::Expectation</small>
@@ -332,7 +340,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Expectation.html#once-instance_method" title="Mocha::Expectation#once (method)">#once</a></span>
       <small>Mocha::Expectation</small>
@@ -340,7 +348,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#optionally-instance_method" title="Mocha::ParameterMatchers#optionally (method)">#optionally</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -348,7 +356,15 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#override-class_method" title="Mocha::Configuration.override (method)">override</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
+  <li class="odd deprecated">
     <div class="item">
       <span class='object_link'><a href="Mocha/Configuration.html#prevent-class_method" title="Mocha::Configuration.prevent (method)">prevent</a></span>
       <small>Mocha::Configuration</small>
@@ -373,6 +389,14 @@
   <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#reinstate_undocumented_behaviour_from_v1_9=-instance_method" title="Mocha::Configuration#reinstate_undocumented_behaviour_from_v1_9= (method)">#reinstate_undocumented_behaviour_from_v1_9=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Mock.html#respond_to%3F-instance_method" title="Mocha::Mock#respond_to? (method)">#respond_to?</a></span>
       <small>Mocha::Mock</small>
@@ -380,7 +404,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Mock.html#responds_like-instance_method" title="Mocha::Mock#responds_like (method)">#responds_like</a></span>
       <small>Mocha::Mock</small>
@@ -388,7 +412,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Mock.html#responds_like_instance_of-instance_method" title="Mocha::Mock#responds_like_instance_of (method)">#responds_like_instance_of</a></span>
       <small>Mocha::Mock</small>
@@ -396,7 +420,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#responds_with-instance_method" title="Mocha::ParameterMatchers#responds_with (method)">#responds_with</a></span>
       <small>Mocha::ParameterMatchers</small>
@@ -404,7 +428,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/Expectation.html#returns-instance_method" title="Mocha::Expectation#returns (method)">#returns</a></span>
       <small>Mocha::Expectation</small>
@@ -412,7 +436,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/API.html#sequence-instance_method" title="Mocha::API#sequence (method)">#sequence</a></span>
       <small>Mocha::API</small>
@@ -420,7 +444,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/StateMachine.html#starts_as-instance_method" title="Mocha::StateMachine#starts_as (method)">#starts_as</a></span>
       <small>Mocha::StateMachine</small>
@@ -428,7 +452,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/API.html#states-instance_method" title="Mocha::API#states (method)">#states</a></span>
       <small>Mocha::API</small>
@@ -436,7 +460,7 @@
   </li>
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/API.html#stub-instance_method" title="Mocha::API#stub (method)">#stub</a></span>
       <small>Mocha::API</small>
@@ -444,7 +468,7 @@
   </li>
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/API.html#stub_everything-instance_method" title="Mocha::API#stub_everything (method)">#stub_everything</a></span>
       <small>Mocha::API</small>
@@ -452,6 +476,46 @@
   </li>
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#stubbing_method_on_nil=-instance_method" title="Mocha::Configuration#stubbing_method_on_nil= (method)">#stubbing_method_on_nil=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#stubbing_method_on_non_mock_object=-instance_method" title="Mocha::Configuration#stubbing_method_on_non_mock_object= (method)">#stubbing_method_on_non_mock_object=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#stubbing_method_unnecessarily=-instance_method" title="Mocha::Configuration#stubbing_method_unnecessarily= (method)">#stubbing_method_unnecessarily=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#stubbing_non_existent_method=-instance_method" title="Mocha::Configuration#stubbing_non_existent_method= (method)">#stubbing_non_existent_method=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Configuration.html#stubbing_non_public_method=-instance_method" title="Mocha::Configuration#stubbing_non_public_method= (method)">#stubbing_non_public_method=</a></span>
+      <small>Mocha::Configuration</small>
+    </div>
+  </li>
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ObjectMethods.html#stubs-instance_method" title="Mocha::ObjectMethods#stubs (method)">#stubs</a></span>
@@ -516,7 +580,7 @@
   </li>
-  <li class="even ">
+  <li class="even deprecated">
     <div class="item">
       <span class='object_link'><a href="Mocha/Configuration.html#warn_when-class_method" title="Mocha::Configuration.warn_when (method)">warn_when</a></span>
       <small>Mocha::Configuration</small>
@@ -540,6 +604,22 @@
   </li>
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Expectation.html#with_block_given-instance_method" title="Mocha::Expectation#with_block_given (method)">#with_block_given</a></span>
+      <small>Mocha::Expectation</small>
+    </div>
+  </li>
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Mocha/Expectation.html#with_no_block_given-instance_method" title="Mocha::Expectation#with_no_block_given (method)">#with_no_block_given</a></span>
+      <small>Mocha::Expectation</small>
+    </div>
+  </li>
   <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Mocha/ParameterMatchers.html#yaml_equivalent-instance_method" title="Mocha::ParameterMatchers#yaml_equivalent (method)">#yaml_equivalent</a></span>