mocha 1.11.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398d43b17f224be63c21bcd24cbe4d1bff6b90267e1a870eb4f2a3432515da88
-  data.tar.gz: bd7c4a5ce95a20b5b403750982d63356e1553af54f45d538cc3e3c514f7fb079
+  metadata.gz: 4f52376e6c8b1042085cca75e7d22e0241452dca80e73de22510f39a83041030
+  data.tar.gz: aa4584255d27f58ee1e9c18935921e352044ac8c2cc91d97221d280e21c54b29
 SHA512:
-  metadata.gz: 0b8a00e3b21f5761fede57f919785ac653e714d28151325980d6ae5bd5d0a7ec5ecdcbaf96d6e36c6659347852e414b3a1c10fb57e0c72b981e70348308174f1
-  data.tar.gz: f85f050cbbb7bfa224420e8ad2f67f6b683576a1d8ef1d79f55acecda495febca0f6b0aae79721c0159028f752c2e19268f06c5dc8e27f40dd5449e8ea5b96ae
+  metadata.gz: d23cc4f2cb0ffcf1464103c1bca607d8a2fac7fef3592dc4637d25ed72dbfd91f5d7234c9f4df23f1c27248829b6638013396e780212f41d9a44236b7a95bd16
+  data.tar.gz: efbcf261aab3292625c56f9f8cab796a19b4dc1ac474a64041ee1a6a92e72c4941b1ce0a0299322e682607d8e8c92598da7ffe853de1257cd92f49027b0891d4

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 1.8.6'
+  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 2.0'
 
 # Even the reference in the documentation suggests that you should prefer
 # `alias_method` vs `alias`, so I don't understand why that isn't the default.
@@ -48,6 +48,10 @@ Style/WhileUntilModifier:
 Style/AccessModifierDeclarations:
   Enabled: false
 
+# This is useful when using `ExecutionPoint.current` to make tests more robust
+Style/Semicolon:
+  Enabled: false
+
 # Enabling this cop results in an "Infinite loop detected" exception
 Layout/AccessModifierIndentation:
   Enabled: false

data/CONTRIBUTING.md

@@ -3,5 +3,5 @@
 * Make your changes in a branch.
 * Add/modify/remove tests as appropriate.
 * Open a pull request based on a branch on your fork.
-* Wait for your pull request build to pass on [Travis CI](https://travis-ci.org/freerange/mocha/pull_requests).
+* Wait for your pull request build to pass on [Circle CI](https://app.circleci.com/pipelines/github/freerange/mocha).
 * Pull requests with failing tests will not be accepted.

data/Gemfile

@@ -1,3 +1,32 @@
 source 'https://rubygems.org'
 
 gemspec
+
+# rubocop:disable Bundler/DuplicatedGem
+if RUBY_VERSION < '2.2'
+  gem 'rake', '~> 12.3.3'
+else
+  gem 'rake'
+end
+# rubocop:enable Bundler/DuplicatedGem
+
+gem 'introspection', '~> 0.0.1'
+
+# Avoid breaking change in psych v4 (https://bugs.ruby-lang.org/issues/17866)
+if RUBY_VERSION >= '3.1.0'
+  gem 'psych', '< 4'
+end
+
+if RUBY_VERSION >= '2.2.0'
+  # No test libraries in standard library
+  gem 'minitest'
+end
+if RUBY_VERSION >= '2.2.0'
+  gem 'rubocop', '<= 0.58.2'
+end
+if ENV['MOCHA_GENERATE_DOCS']
+  gem 'redcarpet'
+  gem 'yard'
+end
+
+gem 'ruby2_keywords', '~> 0.0.5'

data/README.md

@@ -1,5 +1,4 @@
-## Mocha [![Build Status](https://travis-ci.org/freerange/mocha.svg?branch=master)](https://travis-ci.org/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha) [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=mocha&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=mocha&package-manager=bundler&version-scheme=semver)
-
+## Mocha [![CircleCI status of freerange/mocha](https://circleci.com/gh/freerange/mocha.svg?style=shield&circle-token=bc1f6576c77da43ec58badde9273fa4eb1d7f53a)](https://app.circleci.com/pipelines/github/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha)
 
 ### Description
 
@@ -47,35 +46,21 @@ If you're using Bundler, include Mocha in the `Gemfile` and then setup Mocha lat
 
 ```ruby
 # Gemfile
-gem "mocha"
+gem 'mocha'
 
 # Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
-require "test/unit"
-require "mocha/test_unit"
+require 'test/unit'
+require 'mocha/test_unit'
 ```
 
 ##### MiniTest
 
 ```ruby
 # Gemfile
-gem "mocha"
-
-# Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
-require "minitest/unit"
-require "mocha/minitest"
-```
-
-#### Rails
-
-If you're loading Mocha using Bundler within a Rails application, you should setup Mocha manually e.g. at the bottom of your `test_helper.rb`.
-
-##### MiniTest
-
-```ruby
-# Gemfile in Rails app
 gem 'mocha'
 
-# At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
+# Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
+require 'minitest/unit'
 require 'mocha/minitest'
 ```
 
@@ -95,13 +80,6 @@ end
 
 Note: There is no need to use a require statement to setup Mocha; RSpec does this itself.
 
-##### MiniTest
-
-```ruby
-# At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
-require 'mocha/minitest'
-```
-
 ##### Cucumber
 
 ```ruby
@@ -121,9 +99,29 @@ Around do |scenario, block|
 end
 ```
 
+#### Rails
+
+If you're loading Mocha using Bundler within a Rails application, you should setup Mocha manually e.g. at the bottom of your `test_helper.rb`.
+
+##### MiniTest
+
+Note that since Rails v4 (at least), `ActiveSupport::TestCase` has inherited from `Minitest::Test` or its earlier equivalents. Thus unless you are *explicitly* using Test::Unit, you are likely to be using MiniTest.
+
+```ruby
+# Gemfile in Rails app
+gem 'mocha'
+
+# At bottom of test_helper.rb (or at least after `require 'rails/test_help'`)
+require 'mocha/minitest'
+```
+
+##### Other Test Framework
+
+Follow the instructions for the relevant test framework in the [Bundler](#bundler) section, but ensure that the relevant Mocha file (`mocha/minitest`, `mocha/test_unit`, or `mocha/api`) is required **after** the test framework has been loaded, e.g. at the bottom of `test_helper.rb` or `spec_helper.rb`, or at least after `rails/test_help` has been required.
+
 #### Known Issues
 
-* In Mocha v1.10.0 an undocumented feature of `API#mock`, `API#stub` & `API#stub_everything` 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 "name" of the mock object.
+* In Mocha v1.10.0 an undocumented feature of `API#mock`, `API#stub` & `API#stub_everything` 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 'name' of the mock object.
 * 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 bug in Ruby v2.3.1](https://bugs.ruby-lang.org/issues/12832). See #272. This was fixed in Mocha v1.2.1.
 * Since v1.1.0 Mocha has used prepended modules internally for stubbing methods. There is [an obscure Ruby bug](https://bugs.ruby-lang.org/issues/12876) in many (but not all) versions of Ruby between v2.0 & 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 & v2.4.0.
 * Stubbing an aliased class method, where the original method is defined in a module that's used to `extend` the class doesn't work in Ruby 1.8.x. See stub_method_defined_on_module_and_aliased_test.rb for an example of this behaviour.
@@ -304,6 +302,12 @@ See the [documentation](https://mocha.jamesmead.org/Mocha/Configuration.html) fo
 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.
 
+### Semantic versioning
+
+* Every effort is made to comply with [semantic versioning](https://semver.org/).
+* However, this only applies to the behaviour documented in the public API.
+* The documented public API does *not* include the content or format of messsages displayed to the user, e.g. assertion failure messages.
+
 ### Useful Links
 
 * [Official Documentation](https://mocha.jamesmead.org)
@@ -325,7 +329,7 @@ See this [list of contributors](https://github.com/freerange/mocha/graphs/contri
 * Update the RELEASE.md file with a summary of changes
 * Bump the version in `lib/mocha/version.rb`
 * Commit & push to GitHub
-* Check Travis CI build is passing - https://travis-ci.org/freerange/mocha
+* Check CircleCI build is passing - https://app.circleci.com/pipelines/github/freerange/mocha
 
 * Sign in to Google Analytics - https://analytics.google.com/analytics/web/
 * Find the web property ID for floehopper (625523) > Mocha Documentation (UA-625523-7)
@@ -340,7 +344,7 @@ $ MOCHA_GENERATE_DOCS=true GOOGLE_ANALYTICS_WEB_PROPERTY_ID=UA-625523-7 rake gen
 * Sign in to rubygems.org and find API key - https://rubygems.org/profile/edit
 
 ```bash
-$ curl -u james@floehopper.org https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials`
+$ curl -u <email-address> -H 'OTP:<one-time-password>' https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
 ```
 
 * Release gem to Rubygems:

data/RELEASE.md

@@ -1,5 +1,133 @@
 # Release Notes
 
+## 2.0.0
+
+### External changes
+
+* Remove support for Ruby v1.9 - thanks to @wasabigeek (#552)
+* Support strict keyword argument matching - see docs for `Expectation#with` & `Configuration#strict_keyword_argument_matching=` - thanks to @wasabigeek (#446,#535,#544,#562)
+* Deprecate `Hash` args that don't strictly match (#563,981c31be)
+* Drop support for older versions of test-unit - gem versions of test-unit earlier than v2.5.1 and versions of test-unit
+from the Ruby v1.8 standard library are no longer supported (#540,969f4845)
+* Drop support for older versions of minitest - versions of minitest earlier than v3.3.0 are no longer supported (#541,ca69dc9e)
+* Remove deprecated `mocha/setup.rb` mechanism (642a0ff4)
+* Add missing docs for `API#stub` parameter (257b4cb4)
+* Remove optional reinstatement of v1.9 behaviour (#436,#438,#569,1473ee25)
+* Remove deprecated methods in `Configuration` (#421,e7ff7528)
+* Fail fast when mock receives invocations in another test (#440,#442,cb054d59)
+* Improve docs re using matchers in `Expectation#with` (da7237cd)
+* Expand `Expectation#with` docs re keyword arguments (fed6808d)
+* Improve docs for `strict_keyword_argument_matching` (8d8f881d)
+* Remove deprecated Rails plugin `init.rb` file (1c617175)
+* Improve strict keyword argument matching deprecation warning by including the source location of the stub definition (77c0d4cc)
+* Add README section re semantic versioning (00758246)
+
+### Internal changes
+
+* Separate linting from tests in terms of Rake tasks & CircleCI jobs - thanks to @wasabigeek (#556)
+* Remove tests specific to Ruby v1.8 behaviour (46fca7ac, 3b369e99)
+* Multi-line rubocop disable in `Mock#method_missing` (af2194c4)
+* Remove unused arg for `HashMethods#mocha_inspect` (4f59e27f)
+* Improve test runner assertions - failure vs error (eec7200a)
+* Improve test coverage of `PositionalOrKeywordHash` (c294fe70)
+* More consistent Test::Unit & Minitest integration (27dd3817)
+* Remove redundant `require` statements (d82218a8,fa17b114)
+* Add missing `require` statement (73493761)
+* Disable Style/Semicolon cop globally (8cd0b705)
+
+## 1.16.0
+
+### External changes
+
+* Default `Configuration#reinstate_undocumented_behaviour_from_v1_9=` to `false` (6fcaf947)
+* Deprecate `Configuration#reinstate_undocumented_behaviour_from_v1_9=` (a797c5fd)
+
+### Internal changes
+
+* Remove redundant deprecation disabling in MockTest (dc8ca969)
+
+## 1.15.0
+
+### External changes
+
+* Fix examples using mock constructor with block (1cc17667)
+* Add another example for `API#sequence` (b7a7d233, #59)
+* Remove support for Ruby v1.8 (ddb5d672)
+* Deprecate support for Ruby versions earlier than v2.0 - thanks to @wasabigeek (#553, #555)
+
+### Internal changes
+
+* Update instructions for obtaining Rubygems API key (ed9c040a)
+* Consistent definitions for `respond_to?` methods (#533)
+* Run test tasks before release tasks (92a1bc6e, #447)
+* Fix test:performance Rake task (#538, #539)
+* Tidying following removal of support for Ruby v1.8 - thanks to @nitishr (#542)
+* Remove `ParametersMatcher` from `Invocation#call_description` - thanks to @wasabigeek (#543)
+* Remove unnecessary splatting in Invocation - thanks to @wasabigeek (#549)
+* Extract `handle_method_call` from `method_missing` - thanks to @wasabigeek (#550)
+
+## 1.14.0
+
+### External changes
+
+* Mock#expects,#stubs should return last expectation - thanks to @vlad-pisanov for #524 (b6b637db)
+
+### Internal changes
+
+* Avoid breaking change in psych v4 in ruby v3.1 (08b9f4ca)
+* Remove broken Dependabot badge from README (d446657a)
+* Add Ruby 3.0 to the CI matrix - thanks to @mishina2228 for #526 (65bc626e)
+* Move development dependencies from gemspec to Gemfile - thanks to @mishina2228 for #527 (dd127f7b)
+
+## 1.13.0
+
+### External changes
+
+* Add `ParameterMatchers#has_keys` - thanks to @cstyles for #512 (18d8104)
+* Fix misleading exception message in `ParameterMatchers#has_entry` - thanks to @cstyles for #513 (9c4ef13)
+* Only add dependency on rubocop if we're actually going to use it (f2f879f)
+* Fix rake dependency constraints for older Ruby versions (7ce5f29)
+
+### Internal changes
+
+* Check documentation can be generated as part of CircleCI build (b30d9a9)
+* Add --fail-on-warning option to yard rake task (53a6ee3)
+* Add a weekly scheduled build to the CircleCI build (fd2a4c6)
+* Add Ruby v1.8 to the CircleCI build matrix (818ca03)
+* Add API token to fix CircleCI badge in README (607c5aa)
+* Provide wrapped option for #mocha_inspect on hashes & arrays (d8f44bc)
+* Use CircleCI instead of TravisCI for automated builds (c98c6ec)
+* Switch to newer default Travis CI build env (c78f75c)
+* Use latest Ruby versions in Travis CI builds (9e0043a)
+* Use latest JRuby v9.2.18 in Travis CI builds (8c99a1b)
+* Use consistent JRuby versions in Travis CI builds (0f849aa)
+* Use more recent version of JRuby in Travis CI build matrix (58653db)
+
+## 1.12.0
+
+### External changes
+
+* Various improvements to README inspired by #207 and #390 - thanks to @nitishr for his work on #390 (fed0eee6)
+* Improve documentation related to `StateMachine` classes - thanks to @nitishr (#425 & #427)
+* Fix regression in cardinality introduced in v1.10.0 (59454a8) and reported in #473 - thanks to @srvance for reporting and @nitishr for fixing (#474)
+* Fix documentation for `Mocha::Expectation#when` - thanks to @olleolleolle (b4f59daa & #477)
+* Remove `Mocha::Mock#respond_to?` from documentation - thanks to @nitishr (#480)
+* Improvements to documentation for `Expectation#yields` & `#multiple_yields` - thanks to @andyw8 for reporting in #495 (1b6571c)
+* Remove documentation & tests from gem to reduce its size by over 50% - thanks to @gabetax (#500)
+* Update documentation to point to travis-ci.com instead of travis-ci.org
+
+### Internal changes
+
+* Refactor `StateMachine`-related classes - thanks to @nitishr (#425 & #427)
+* Remove redundant test - thanks to @nitishr (8e4f1a7c)
+* Add Ruby 2.7 to Travis CI matrix - thanks to @bastelfreak (fc5ea2f2)
+* Simplify `Mockery` - thanks to @nitishr (#449)
+* Update Travis CI badge to point to main vs master branch (bd8028f8)
+* Generate docs using newer version of yard (v0.9.25) (c619afac)
+* Manually upgrade jquery in docs from v1.7.1 -> v1.9.0 to fix CVE-2017-16011 (211098a5, dd5eeedb & 1b76e4d5; also see #492)
+* Remove reference to non-existent jquery source map to fix error in Chrome developer tools (20156555)
+* Temporarily ignore Ruby v1.8.7 build failures (e5b9feef)
+
 ## 1.11.2
 
 ### External changes

data/Rakefile

@@ -1,11 +1,18 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+namespace 'rubygems' do
+  Bundler::GemHelper.install_tasks
+end
 require 'bundler/setup'
 
 require 'rake/testtask'
+begin
+  # Only available with default Gemfile and in Ruby >= v2.2
+  require 'rubocop/rake_task'
+rescue LoadError # rubocop:disable Lint/HandleExceptions
+end
 
-desc 'Run all tests'
-task 'default' => ['test', 'test:performance']
+desc 'Run all linters and tests'
+task 'default' => ['lint', 'test', 'test:performance']
 
 desc 'Run tests'
 task 'test' do
@@ -18,15 +25,10 @@ task 'test' do
 end
 
 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']
-  ruby186_compatible_acceptance_tests = all_acceptance_tests - ruby186_incompatible_acceptance_tests
-
   desc 'Run unit tests'
   Rake::TestTask.new('units') do |t|
     t.libs << 'test'
-    t.test_files = unit_tests
+    t.test_files = FileList['test/unit/**/*_test.rb']
     t.verbose = true
     t.warning = true
   end
@@ -34,11 +36,7 @@ namespace 'test' do # rubocop:disable Metrics/BlockLength
   desc 'Run acceptance tests'
   Rake::TestTask.new('acceptance') do |t|
     t.libs << 'test'
-    t.test_files = if defined?(RUBY_VERSION) && (RUBY_VERSION >= '1.8.7')
-                     all_acceptance_tests
-                   else
-                     ruby186_compatible_acceptance_tests
-                   end
+    t.test_files = FileList['test/acceptance/*_test.rb']
     t.verbose = true
     t.warning = true
   end
@@ -83,13 +81,13 @@ namespace 'test' do # rubocop:disable Metrics/BlockLength
   end
 end
 
-begin
-  require 'rubocop/rake_task'
-  if RUBY_VERSION >= '2.2.0' && (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby') && ENV['MOCHA_RUN_INTEGRATION_TESTS'].nil?
+task 'lint' do
+  if defined?(RuboCop::RakeTask)
     RuboCop::RakeTask.new
-    task 'test' => 'rubocop'
+    Rake::Task['rubocop'].invoke
+  else
+    puts 'RuboCop not available - skipping linting'
   end
-rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
 # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
@@ -100,6 +98,7 @@ def benchmark_test_case(klass, iterations)
   if defined?(MiniTest)
     minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
     if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
+      Minitest.seed = 1
       result = Benchmark.realtime { iterations.times { |_i| klass.run(MiniTest::CompositeReporter.new) } }
       MiniTest::Runnable.runnables.delete(klass)
       result
@@ -138,15 +137,20 @@ if ENV['MOCHA_GENERATE_DOCS']
 
   desc 'Generate documentation'
   YARD::Rake::YardocTask.new('yardoc' => 'docs_environment') do |task|
-    task.options = ['--title', "Mocha #{Mocha::VERSION}"]
+    task.options = ['--title', "Mocha #{Mocha::VERSION}", '--fail-on-warning']
   end
 
   task 'checkout_docs_cname' do
     `git checkout docs/CNAME`
   end
 
+  task 'checkout_docs_js' do
+    `git checkout docs/js/app.js`
+    `git checkout docs/js/jquery.js`
+  end
+
   desc 'Generate documentation'
-  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname]
+  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname checkout_docs_js]
 end
 
-task 'release' => 'default'
+task 'release' => ['default', 'rubygems:release']

data/gemfiles/Gemfile.minitest.latest

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gemspec :path=>"../"
 
 group :development do
+  gem "rake"
   gem "minitest"
 end

data/gemfiles/Gemfile.test-unit.latest

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 gemspec :path=>"../"
 
 group :development do
-  if RUBY_VERSION < '1.9'
-    gem "test-unit", "~> 2"
-  else
-    gem "test-unit"
-  end
+  gem "rake"
+  gem "test-unit"
 end

data/lib/mocha/any_instance_method.rb

@@ -1,4 +1,3 @@
-require 'mocha/ruby_version'
 require 'mocha/stubbed_method'
 
 module Mocha
@@ -9,10 +8,6 @@ module Mocha
       stubbee.any_instance
     end
 
-    def method_body(method)
-      method
-    end
-
     def stubbee_method(method_name)
       stubbee.instance_method(method_name)
     end

data/lib/mocha/api.rb

@@ -1,3 +1,4 @@
+require 'mocha/ruby_version'
 require 'mocha/parameter_matchers'
 require 'mocha/hooks'
 require 'mocha/mockery'
@@ -51,7 +52,6 @@ module Mocha
     #
     # @overload def mock(name)
     #   @param [String, Symbol] name identifies mock object in error messages.
-    #   @note Prior to v1.10.0 when +name+ was a +Symbol+, this method returned an unnamed +Mock+ that expected the method identified by +name+. This was undocumented behaviour and it will be removed in the future, but for the moment it can be reinstated using {Configuration#reinstate_undocumented_behaviour_from_v1_9=}.
     # @overload def mock(expected_methods_vs_return_values = {})
     #   @param [Hash] expected_methods_vs_return_values expected method name symbols as keys and corresponding return values as values - these expectations are setup as if {Mock#expects} were called multiple times.
     # @overload def mock(name, expected_methods_vs_return_values = {})
@@ -66,26 +66,8 @@ module Mocha
     #     # an error will be raised unless both Motor#start and Motor#stop have been called
     #   end
     #
-    def mock(*arguments) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-      if Mocha.configuration.reinstate_undocumented_behaviour_from_v1_9?
-        if arguments.first.is_a?(Symbol)
-          method_name = arguments[0]
-          Deprecation.warning(
-            "Explicitly include `#{method_name}` in Hash of expected methods vs return values,",
-            " e.g. `mock(:#{method_name} => nil)`."
-          )
-          if arguments[1]
-            Deprecation.warning(
-              "In this case the 2nd argument for `mock(:##{method_name}, ...)` is ignored,",
-              ' but in the future a Hash of expected methods vs return values will be respected.'
-            )
-          end
-        elsif arguments.first.is_a?(String)
-          name = arguments.shift
-        end
-      elsif arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
-        name = arguments.shift
-      end
+    def mock(*arguments)
+      name = arguments.shift.to_s if arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
       expectations = arguments.shift || {}
       mock = name ? Mockery.instance.named_mock(name) : Mockery.instance.unnamed_mock
       mock.expects(expectations)
@@ -98,11 +80,11 @@ module Mocha
     #
     # @overload def stub(name)
     #   @param [String, Symbol] name identifies mock object in error messages.
-    #   @note Prior to v1.10.0 when +name+ was a +Symbol+, this method returned an unnamed +Mock+ that stubbed the method identified by +name+. This was undocumented behaviour and it will be removed in the future, but for the moment it can be reinstated using {Configuration#reinstate_undocumented_behaviour_from_v1_9=}.
     # @overload def stub(stubbed_methods_vs_return_values = {})
     #   @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
     # @overload def stub(name, stubbed_methods_vs_return_values = {})
     #   @param [String, Symbol] name identifies mock object in error messages.
+    #   @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
     #
     # @example Using stubbed_methods_vs_return_values Hash to setup stubbed methods.
     #   def test_motor_starts_and_stops
@@ -111,33 +93,13 @@ module Mocha
     #     assert motor.stop
     #     # an error will not be raised even if either Motor#start or Motor#stop has not been called
     #   end
-    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     def stub(*arguments)
-      if Mocha.configuration.reinstate_undocumented_behaviour_from_v1_9?
-        if arguments.first.is_a?(Symbol)
-          method_name = arguments[0]
-          Deprecation.warning(
-            "Explicitly include `#{method_name}` in Hash of stubbed methods vs return values,",
-            " e.g. `stub(:#{method_name} => nil)`."
-          )
-          if arguments[1]
-            Deprecation.warning(
-              "In this case the 2nd argument for `stub(:##{method_name}, ...)` is ignored,",
-              ' but in the future a Hash of stubbed methods vs return values will be respected.'
-            )
-          end
-        elsif arguments.first.is_a?(String)
-          name = arguments.shift
-        end
-      elsif arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
-        name = arguments.shift
-      end
+      name = arguments.shift.to_s if arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
       expectations = arguments.shift || {}
       stub = name ? Mockery.instance.named_mock(name) : Mockery.instance.unnamed_mock
       stub.stubs(expectations)
       stub
     end
-    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
     # Builds a mock object that accepts calls to any method. By default it will return +nil+ for any method call.
     #
@@ -145,7 +107,6 @@ module Mocha
     #
     # @overload def stub_everything(name)
     #   @param [String, Symbol] name identifies mock object in error messages.
-    #   @note Prior to v1.10.0 when +name+ was a +Symbol+, this method returned an unnamed +Mock+ that stubbed the method identified by +name+. This was undocumented behaviour and it will be removed in the future, but for the moment it can be reinstated using {Configuration#reinstate_undocumented_behaviour_from_v1_9=}.
     # @overload def stub_everything(stubbed_methods_vs_return_values = {})
     #   @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {Mock#stubs} were called multiple times.
     # @overload def stub_everything(name, stubbed_methods_vs_return_values = {})
@@ -159,34 +120,14 @@ module Mocha
     #     assert_nil motor.irrelevant_method_2 # => no error raised
     #     assert motor.stop
     #   end
-    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     def stub_everything(*arguments)
-      if Mocha.configuration.reinstate_undocumented_behaviour_from_v1_9?
-        if arguments.first.is_a?(Symbol)
-          method_name = arguments[0]
-          Deprecation.warning(
-            "Explicitly include `#{method_name}` in Hash of stubbed methods vs return values,",
-            " e.g. `stub_everything(:#{method_name} => nil)`."
-          )
-          if arguments[1]
-            Deprecation.warning(
-              "In this case the 2nd argument for `stub_everything(:##{method_name}, ...)` is ignored,",
-              ' but in the future a Hash of stubbed methods vs return values will be respected.'
-            )
-          end
-        elsif arguments.first.is_a?(String)
-          name = arguments.shift
-        end
-      elsif arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
-        name = arguments.shift
-      end
+      name = arguments.shift if arguments.first.is_a?(String) || arguments.first.is_a?(Symbol)
       expectations = arguments.shift || {}
       stub = name ? Mockery.instance.named_mock(name) : Mockery.instance.unnamed_mock
       stub.stub_everything
       stub.stubs(expectations)
       stub
     end
-    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
     # Builds a new sequence which can be used to constrain the order in which expectations can occur.
     #
@@ -199,11 +140,22 @@ module Mocha
     # @example Ensure methods on egg are invoked in correct order.
     #   breakfast = sequence('breakfast')
     #
-    #   egg = mock('egg') do
-    #     expects(:crack).in_sequence(breakfast)
-    #     expects(:fry).in_sequence(breakfast)
-    #     expects(:eat).in_sequence(breakfast)
-    #   end
+    #   egg = mock('egg')
+    #   egg.expects(:crack).in_sequence(breakfast)
+    #   egg.expects(:fry).in_sequence(breakfast)
+    #   egg.expects(:eat).in_sequence(breakfast)
+    #
+    # @example Ensure methods across multiple objects are invoked in correct order.
+    #   sequence = sequence(:task_order)
+    #
+    #   task_one = mock("task_one")
+    #   task_two = mock("task_two")
+    #
+    #   task_one.expects(:execute).in_sequence(sequence)
+    #   task_two.expects(:execute).in_sequence(sequence)
+    #
+    #   task_one.execute
+    #   task_two.execute
     def sequence(name)
       Sequence.new(name)
     end
@@ -226,14 +178,13 @@ module Mocha
     # @example Constrain expected invocations to occur in particular states.
     #   power = states('power').starts_as('off')
     #
-    #   radio = mock('radio') do
-    #     expects(:switch_on).then(power.is('on'))
-    #     expects(:select_channel).with('BBC Radio 4').when(power.is('on'))
-    #     expects(:adjust_volume).with(+5).when(power.is('on'))
-    #     expects(:select_channel).with('BBC World Service').when(power.is('on'))
-    #     expects(:adjust_volume).with(-5).when(power.is('on'))
-    #     expects(:switch_off).then(power.is('off'))
-    #   end
+    #   radio = mock('radio')
+    #   radio.expects(:switch_on).then(power.is('on'))
+    #   radio.expects(:select_channel).with('BBC Radio 4').when(power.is('on'))
+    #   radio.expects(:adjust_volume).with(+5).when(power.is('on'))
+    #   radio.expects(:select_channel).with('BBC World Service').when(power.is('on'))
+    #   radio.expects(:adjust_volume).with(-5).when(power.is('on'))
+    #   radio.expects(:switch_off).then(power.is('off'))
     def states(name)
       Mockery.instance.new_state_machine(name)
     end