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

mocha 1.5.0 → 1.10.0.alpha

Files changed (310) hide show

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

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae952b50093776beef6c7083184899e6875738d7
-  data.tar.gz: b45fc4c6fe7d7ab128a7227f3fdf2db01e349989
+SHA256:
+  metadata.gz: 17067ef2117df2bcf63d40f8e764f28d584a5e6243e40d42533a571532329c43
+  data.tar.gz: c2ce2f9b3ca8950dc8fa8958a106bac339f3a96018849c50954ac4b53f024893
 SHA512:
-  metadata.gz: c5ca31997f0e6342f4d757a4a42da220cbc51878b878b48f61b4d74b095f7347a846c6196f65568c4dde737c8ccbe13e15eba3fce25054d5232724535021a1b3
-  data.tar.gz: b8797e8b7e3a58b31e3f773860989aafc85fabd2cbf4529a965b521e7ec1f995304b26186f49062c6ec8af6b8b4749730e89373ebf1e909df1b7e7fb5ca793a1
+  metadata.gz: c40927eb7a63d40a2fd77676e5a3c2362d20f3e0601386c3e848f96d631d1ee1101d46619ed8a3f1fea952e3d9a56f0cc9205fe94b115866358bac2baadf3958
+  data.tar.gz: ce24527412963c7c89611d2517ee20790e01efa4dafa5b3c0f6229b7993baaf5c8db2b7e49b378f65d61070390ab0ccf797f7b1cbf1bcfa3ba98f363b6473e21

data/.rubocop.yml ADDED

@@ -0,0 +1,61 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 1.8.6'
+# 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.
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+Style/Documentation:
+  Enabled: false
+# Enumerable#each_with_object only available since Ruby v1.9
+Style/EachWithObject:
+  Enabled: false
+# Kernel#__dir__ has only been available since Ruby v2.0
+Style/ExpandPathArguments:
+  Enabled: false
+# Kernel#format has only supported named references since Ruby v1.9
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+# ruby19 style has only been supported since Ruby v1.9
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+# I'm not keen on this cop, because it's easy to miss the conditional
+# I think the results are particularly unhelpful when Metrics/LineLength is big
+Style/IfUnlessModifier:
+  Enabled: false
+# Lambda literal syntax has only been supported since Ruby v2.0
+Style/Lambda:
+  EnforcedStyle: lambda
+# Symbol array literal syntax has only been supported since Ruby v2.0
+Style/SymbolArray:
+  Enabled: false
+# I'm not keen on this cop, because it's easy to miss the while/until
+Style/WhileUntilModifier:
+  Enabled: false
+# This recently introduced cop seems to have stirred up some controversy
+Style/AccessModifierDeclarations:
+  Enabled: false
+# Enabling this cop results in an "Infinite loop detected" exception
+Layout/AccessModifierIndentation:
+  Enabled: false
+# Allow long comment lines, e.g. YARD documentation
+Metrics/LineLength:
+  IgnoredPatterns: ['\A\s*#']
+# It's not possible to set TargetRubyVersion to Ruby < v2.2
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.rubocop_todo.yml ADDED

@@ -0,0 +1,27 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# 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: 57
+Metrics/AbcSize:
+  Max: 26
+# Offense count: 23
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 366
+# Offense count: 172
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 31
+# Offense count: 545
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 180

data/CONTRIBUTING.md CHANGED

@@ -1,12 +1,7 @@
 * Pull requests are welcomed.
 * Fork the repository.
 * Make your changes in a branch.
-* Add tests for new behaviour. Modify/remove existing tests for changes to existing behaviour.
-* Run `bin/build-matrix` from the root directory and ensure all the tests pass.
-  * This script depends on `rbenv` being installed.
-  * You must have all the ruby versions listed in `.travis.yml` under the `rvm` key installed (currently 1.8.7, 1.9.3 & 2.0.0).
-  * I use `rbenv-aliases` to alias the patch versions.
-  * Note that the build matrix takes quite a while to run.
-* Send us a pull request from your fork/branch.
-* Wait for your pull request to build on [Travis CI](https://travis-ci.org/freerange/mocha).
-* I will not accept pull requests with failing tests.
+* 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).
+* Pull requests with failing tests will not be accepted.

data/README.md CHANGED

@@ -1,13 +1,16 @@
-## 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.png)](http://badge.fury.io/rb/mocha) [![OpenCollective](https://opencollective.com/mocha/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/mocha/sponsors/badge.svg)](#sponsors)
+## 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)
 ### 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
@@ -256,7 +250,15 @@ end
 ### Thread safety
-Mocha is currently *not* thread-safe. There are two main reasons for this: (a) in multi-threaded code Mocha exceptions may be raised in a thread other than the one which is running the test and thus a Mocha exception may not be correctly intercepted by Mocha exception handling code; and (b) partial mocking changes the state of objects in the `ObjectSpace` which is shared across all threads in the Ruby process and this access to what is effectively global state is not synchronized.
+Mocha currently *does not* attempt to be thread-safe.
+#### Can I test multi-threaded code with Mocha?
+The short answer is no. In multi-threaded code Mocha exceptions may be raised in a thread other than the one which is running the test and thus a Mocha exception may not be correctly intercepted by Mocha exception handling code.
+#### Can I run my tests across multiple threads?
+Maybe, but probably not. Partial mocking changes the state of objects in the `ObjectSpace` which is shared across all threads in the Ruby process and this access to what is effectively global state is not synchronized. So, for example, if two tests are running concurrently and one uses `#any_instance` to modify a class, both tests will see those changes immediately.
 ### Expectation matching / invocation order
@@ -264,11 +266,27 @@ Stubs and expectations are basically the same thing. A stub is just an expectati
 When a method is invoked on a mock object, the mock object searches through its expectations from newest to oldest to find one that matches the invocation. After the invocation, the matching expectation might stop matching further invocations.
-See the [documentation](http://gofreerange.com/mocha/docs/Mocha/Mock.html) for `Mocha::Mock` for further details.
+See the [documentation](https://mocha.jamesmead.org/Mocha/Mock.html) for `Mocha::Mock` for further details.
+### Configuration
+If you want, Mocha can generate a warning or raise an exception when:
+* stubbing a method unnecessarily
+* stubbing method on a non-mock object
+* stubbing a non-existent method
+* stubbing a non-public method
+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](http://gofreerange.com/mocha/docs/)
+* [Official Documentation](https://mocha.jamesmead.org)
 * [Source Code](http://github.com/freerange/mocha)
 * [Mailing List](http://groups.google.com/group/mocha-developer)
 * [James Mead's Blog](http://jamesmead.org/blog/)
@@ -282,107 +300,38 @@ See the [documentation](http://gofreerange.com/mocha/docs/Mocha/Mock.html) for `
 See this [list of contributors](https://github.com/freerange/mocha/graphs/contributors).
-### Backers
-Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/mocha#backer)]
-<a href="https://opencollective.com/mocha/backer/0/website" target="_blank"><img src="https://opencollective.com/mocha/backer/0/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/1/website" target="_blank"><img src="https://opencollective.com/mocha/backer/1/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/2/website" target="_blank"><img src="https://opencollective.com/mocha/backer/2/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/3/website" target="_blank"><img src="https://opencollective.com/mocha/backer/3/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/4/website" target="_blank"><img src="https://opencollective.com/mocha/backer/4/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/5/website" target="_blank"><img src="https://opencollective.com/mocha/backer/5/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/6/website" target="_blank"><img src="https://opencollective.com/mocha/backer/6/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/7/website" target="_blank"><img src="https://opencollective.com/mocha/backer/7/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/8/website" target="_blank"><img src="https://opencollective.com/mocha/backer/8/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/9/website" target="_blank"><img src="https://opencollective.com/mocha/backer/9/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/10/website" target="_blank"><img src="https://opencollective.com/mocha/backer/10/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/11/website" target="_blank"><img src="https://opencollective.com/mocha/backer/11/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/12/website" target="_blank"><img src="https://opencollective.com/mocha/backer/12/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/13/website" target="_blank"><img src="https://opencollective.com/mocha/backer/13/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/14/website" target="_blank"><img src="https://opencollective.com/mocha/backer/14/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/15/website" target="_blank"><img src="https://opencollective.com/mocha/backer/15/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/16/website" target="_blank"><img src="https://opencollective.com/mocha/backer/16/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/17/website" target="_blank"><img src="https://opencollective.com/mocha/backer/17/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/18/website" target="_blank"><img src="https://opencollective.com/mocha/backer/18/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/19/website" target="_blank"><img src="https://opencollective.com/mocha/backer/19/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/20/website" target="_blank"><img src="https://opencollective.com/mocha/backer/20/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/21/website" target="_blank"><img src="https://opencollective.com/mocha/backer/21/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/22/website" target="_blank"><img src="https://opencollective.com/mocha/backer/22/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/23/website" target="_blank"><img src="https://opencollective.com/mocha/backer/23/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/24/website" target="_blank"><img src="https://opencollective.com/mocha/backer/24/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/25/website" target="_blank"><img src="https://opencollective.com/mocha/backer/25/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/26/website" target="_blank"><img src="https://opencollective.com/mocha/backer/26/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/27/website" target="_blank"><img src="https://opencollective.com/mocha/backer/27/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/28/website" target="_blank"><img src="https://opencollective.com/mocha/backer/28/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/backer/29/website" target="_blank"><img src="https://opencollective.com/mocha/backer/29/avatar.svg"></a>
-### Sponsors
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/mocha#sponsor)]
-<a href="https://opencollective.com/mocha/sponsor/0/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/1/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/2/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/3/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/4/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/5/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/6/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/7/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/8/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/9/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/9/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/10/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/10/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/11/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/11/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/12/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/12/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/13/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/13/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/14/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/14/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/15/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/15/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/16/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/16/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/17/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/17/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/18/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/18/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/19/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/19/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/20/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/20/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/21/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/21/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/22/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/22/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/23/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/23/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/24/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/24/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/25/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/25/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/26/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/26/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/27/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/27/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/28/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/28/avatar.svg"></a>
-<a href="https://opencollective.com/mocha/sponsor/29/website" target="_blank"><img src="https://opencollective.com/mocha/sponsor/29/avatar.svg"></a>
-### Translations
-* [Serbo-Croatian](http://science.webhostinggeeks.com/mocha) by [WHG Team](http://webhostinggeeks.com/). (may be out-of-date)
 ### Releasing a new version
 * Update the RELEASE.md file with a summary of changes
 * Bump the version in `lib/mocha/version.rb`
-* Commit & push to Github
+* Commit & push to GitHub
 * 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 floehopper (625523) > Mocha Documentation (UA-625523-7)
+* Generate documentation:
+```bash
+$ MOCHA_GENERATE_DOCS=true bundle install
+$ MOCHA_GENERATE_DOCS=true GOOGLE_ANALYTICS_WEB_PROPERTY_ID=UA-625523-7 rake generate_docs
+```
+* Commit documentation & push to GitHub
 * 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`
 ```
-* Sign in to Google Analytics - https://analytics.google.com/analytics/web/
-* Find the web property ID for Go Free Range Ltd > Mocha Documentation (UA-45002715-2)
+* Release gem to Rubygems:
 ```bash
-$ MOCHA_GENERATE_DOCS=true bundle install
-$ MOCHA_GENERATE_DOCS=true GOOGLE_ANALYTICS_WEB_PROPERTY_ID=UA-45002715-2 rake release
+$ rake release
+[runs tests]
 mocha 1.2.0 built to pkg/mocha-1.2.0.gem.
 Tagged v1.2.0.
 Pushed git commits and tags.
 Pushed mocha 1.2.0 to rubygems.org.
-[runs tests]
-[generates docs]
-[deploys docs]
 ```
 ### History

data/RELEASE.md CHANGED

@@ -1,5 +1,88 @@
 # 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)
+* Explicitly set Travis CI OS to Ubuntu Trusty 14.04 (ded1fa45)
+* Expand explanation of thread-safety concerns - thanks to @techbelly (#357)
+* Refactor class method and any instance method - thanks to @chrisroos (#358)
+* Rely on default bundler version in Travis CI builds (3352e9c5)
+* Fix local build-matrix script (11abe231)
+* No need to install latest bundler in build-matrix script (8247a894)
+## 1.8.0
+* Constrain rubocop version to avoid breaking Travis CI builds (05e507f5)
+* Avoid calling Kernel#format from ObjectMethods#mocha_inspect - thanks to @hoffmanilya (#345)
+* Fix build matrix script (#346)
+* Avoid deprecation warning in gemspec (4976e0bc)
+* Removed link to documentation translation (ef428ea2)
+* Don't use the new bundler v2 in builds (683ded9b)
+* Moved documentation from https://gofreerange.com/mocha/docs to https://mocha.jamesmead.org/ [683ded...a17fde](https://github.com/freerange/mocha/compare/683ded...a17fde)
+## 1.7.0
+* Update Ruby & JRuby versions in Travis CI config (9bf55631 & 3883af7e)
+* Simplify gemspec (63744f86)
+* Add rubocop and fix most cop violations (#341)
+* Use Kernel#warn for deprecations - thanks to @etiennebarrie (#333, 196970a)
+## 1.6.0
+* Fix subtle bug in setting correct visibility of stubbed module methods on `Kernel` or `Object` - thanks to @chrisroos (#295)
+* Avoid mocks for partial mocking leaking into subsequent tests - thanks to @skliew for reporting (#331)
+* Remove OpenCollective badge, backers & sponsors (a283a079)
+* Change gem version badge to SVG format and add SemVer stability badge - thanks to @greysteil (#335)
+* Improve documentation for Configuration (#236)
 ## 1.5.0
 * Prevent use of Mocha outside the context of a test/example - thanks to @andyw8 & @lzap (#327)

data/Rakefile CHANGED

@@ -1,17 +1,15 @@
-require "bundler"
+require 'bundler'
 Bundler::GemHelper.install_tasks
-require "bundler/setup"
-MOCHA_DOCS_HOST = ENV['MOCHA_DOCS_HOST'] || 'gofreerange.com'
+require 'bundler/setup'
 require 'rake/testtask'
-desc "Run all tests"
+desc 'Run all tests'
 task 'default' => ['test', 'test:performance']
-desc "Run tests"
+desc 'Run tests'
 task 'test' do
-  if test_library = ENV['MOCHA_RUN_INTEGRATION_TESTS']
+  if (test_library = ENV['MOCHA_RUN_INTEGRATION_TESTS'])
     Rake::Task["test:integration:#{test_library}"].invoke
   else
     Rake::Task['test:units'].invoke
@@ -19,14 +17,13 @@ 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']
   ruby186_compatible_acceptance_tests = all_acceptance_tests - ruby186_incompatible_acceptance_tests
-  desc "Run unit tests"
+  desc 'Run unit tests'
   Rake::TestTask.new('units') do |t|
     t.libs << 'test'
     t.test_files = unit_tests
@@ -34,20 +31,20 @@ namespace 'test' do
     t.warning = true
   end
-  desc "Run acceptance tests"
+  desc 'Run acceptance tests'
   Rake::TestTask.new('acceptance') do |t|
     t.libs << 'test'
-    if defined?(RUBY_VERSION) && (RUBY_VERSION >= "1.8.7")
-      t.test_files = all_acceptance_tests
-    else
-      t.test_files = ruby186_compatible_acceptance_tests
-    end
+    t.test_files = if defined?(RUBY_VERSION) && (RUBY_VERSION >= '1.8.7')
+                     all_acceptance_tests
+                   else
+                     ruby186_compatible_acceptance_tests
+                   end
     t.verbose = true
     t.warning = true
   end
   namespace 'integration' do
-    desc "Run MiniTest integration tests (intended to be run in its own process)"
+    desc 'Run MiniTest integration tests (intended to be run in its own process)'
     Rake::TestTask.new('minitest') do |t|
       t.libs << 'test'
       t.test_files = FileList['test/integration/mini_test_test.rb']
@@ -55,7 +52,7 @@ namespace 'test' do
       t.warning = true
     end
-    desc "Run Test::Unit integration tests (intended to be run in its own process)"
+    desc 'Run Test::Unit integration tests (intended to be run in its own process)'
     Rake::TestTask.new('test-unit') do |t|
       t.libs << 'test'
       t.test_files = FileList['test/integration/test_unit_test.rb']
@@ -74,7 +71,7 @@ namespace 'test' do
   #   t.rcov_opts << '--xref'
   # end
-  desc "Run performance tests"
+  desc 'Run performance tests'
   task 'performance' do
     require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'stubba_example_test')
     require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'mocha_example_test')
@@ -84,9 +81,18 @@ namespace 'test' do
       puts "#{test_case}: #{benchmark_test_case(test_case, iterations)} seconds."
     end
   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?
+    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'
@@ -94,33 +100,34 @@ 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)
-      result = Benchmark.realtime { iterations.times { |i| klass.run(MiniTest::CompositeReporter.new) } }
+      result = Benchmark.realtime { iterations.times { |_i| klass.run(MiniTest::CompositeReporter.new) } }
       MiniTest::Runnable.runnables.delete(klass)
       result
     else
       MiniTest::Unit.output = StringIO.new
-      Benchmark.realtime { iterations.times { |i| MiniTest::Unit.new.run([klass]) } }
+      Benchmark.realtime { iterations.times { |_i| MiniTest::Unit.new.run([klass]) } }
     end
   else
     load 'test/unit/ui/console/testrunner.rb' unless defined?(Test::Unit::UI::Console::TestRunner)
-    unless $silent_option
+    unless @silent_option
       begin
         load 'test/unit/ui/console/outputlevel.rb' unless defined?(Test::Unit::UI::Console::OutputLevel::SILENT)
-        $silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
+        @silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
       rescue LoadError
-        $silent_option = Test::Unit::UI::SILENT
+        @silent_option = Test::Unit::UI::SILENT
       end
     end
-    Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, $silent_option) } }
+    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"]
+if ENV['MOCHA_GENERATE_DOCS']
   require 'yard'
   desc 'Remove generated documentation'
   task 'clobber_yardoc' do
-    `rm -rf ./doc`
+    `rm -rf ./docs`
   end
   task 'docs_environment' do
@@ -131,19 +138,18 @@ 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}",
+      '--output-dir', 'docs'
+    ]
   end
-  desc "Generate documentation"
-  task 'generate_docs' => ['clobber_yardoc', 'yardoc']
-  desc "Publish docs to #{MOCHA_DOCS_HOST}/docs/mocha"
-  task 'publish_docs' => 'generate_docs' do
-    path = "/home/freerange/docs/mocha"
-    system %{ssh #{MOCHA_DOCS_HOST} "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* #{MOCHA_DOCS_HOST}:#{path}}
+  task 'checkout_docs_cname' do
+    `git checkout docs/CNAME`
   end
-end
-task 'release' => 'default' do
-  Rake::Task['publish_docs'].invoke
+  desc 'Generate documentation'
+  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname]
 end
+task 'release' => 'default'