RubyGems - mocha - Versions diffs - 1.2.1 → 2.0.0 - Mend

mocha 1.2.1 → 2.0.0

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

Files changed (266) hide show

checksums.yaml +5 -5
data/.github/FUNDING.yml +1 -0
data/.rubocop.yml +65 -0
data/.rubocop_todo.yml +27 -0
data/.yardopts +1 -0
data/CONTRIBUTING.md +4 -9
data/Gemfile +29 -0
data/README.md +110 -106
data/RELEASE.md +306 -1
data/Rakefile +52 -45
data/gemfiles/Gemfile.minitest.latest +1 -0
data/gemfiles/Gemfile.test-unit.latest +2 -5
data/lib/mocha/any_instance_method.rb +9 -62
data/lib/mocha/api.rb +84 -68
data/lib/mocha/argument_iterator.rb +4 -8
data/lib/mocha/backtrace_filter.rb +1 -5
data/lib/mocha/block_matcher.rb +31 -0
data/lib/mocha/cardinality.rb +60 -49
data/lib/mocha/central.rb +21 -12
data/lib/mocha/change_state_side_effect.rb +0 -4
data/lib/mocha/class_methods.rb +19 -21
data/lib/mocha/configuration.rb +312 -47
data/lib/mocha/debug.rb +3 -2
data/lib/mocha/deprecation.rb +8 -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 +13 -0
data/lib/mocha/exception_raiser.rb +4 -6
data/lib/mocha/expectation.rb +186 -95
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 +1 -3
data/lib/mocha/in_state_ordering_constraint.rb +0 -4
data/lib/mocha/inspect.rb +30 -38
data/lib/mocha/instance_method.rb +11 -8
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.rb +10 -31
data/lib/mocha/integration/monkey_patcher.rb +5 -7
data/lib/mocha/integration/test_unit/adapter.rb +5 -6
data/lib/mocha/integration/test_unit.rb +10 -26
data/lib/mocha/invocation.rb +73 -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 +6 -0
data/lib/mocha/mock.rb +99 -51
data/lib/mocha/mockery.rb +70 -99
data/lib/mocha/names.rb +2 -12
data/lib/mocha/not_initialized_error.rb +7 -0
data/lib/mocha/object_methods.rb +25 -31
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 +7 -13
data/lib/mocha/parameter_matchers/equals.rb +0 -6
data/lib/mocha/parameter_matchers/{query_string.rb → equivalent_uri.rb} +14 -15
data/lib/mocha/parameter_matchers/has_entries.rb +2 -7
data/lib/mocha/parameter_matchers/has_entry.rb +26 -21
data/lib/mocha/parameter_matchers/has_key.rb +2 -7
data/lib/mocha/parameter_matchers/has_keys.rb +53 -0
data/lib/mocha/parameter_matchers/has_value.rb +2 -7
data/lib/mocha/parameter_matchers/includes.rb +6 -7
data/lib/mocha/parameter_matchers/instance_methods.rb +27 -0
data/lib/mocha/parameter_matchers/instance_of.rb +0 -6
data/lib/mocha/parameter_matchers/is_a.rb +2 -7
data/lib/mocha/parameter_matchers/kind_of.rb +2 -6
data/lib/mocha/parameter_matchers/not.rb +2 -7
data/lib/mocha/parameter_matchers/optionally.rb +4 -10
data/lib/mocha/parameter_matchers/positional_or_keyword_hash.rb +64 -0
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/parameter_matchers.rb +3 -4
data/lib/mocha/parameters_matcher.rb +8 -11
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/ruby_version.rb +1 -2
data/lib/mocha/sequence.rb +4 -9
data/lib/mocha/single_return_value.rb +2 -5
data/lib/mocha/state_machine.rb +33 -46
data/lib/mocha/stubbed_method.rb +88 -0
data/lib/mocha/stubbing_error.rb +2 -13
data/lib/mocha/test_unit.rb +5 -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 +7 -17
data/mocha.gemspec +14 -65
data/yard-templates/default/layout/html/google_analytics.erb +6 -9
data/yard-templates/default/layout/html/setup.rb +2 -3
metadata +26 -266
data/bin/build-matrix +0 -70
data/gemfiles/Gemfile.minitest.1.3.0 +0 -7
data/gemfiles/Gemfile.minitest.1.4.0 +0 -7
data/gemfiles/Gemfile.minitest.1.4.1 +0 -7
data/gemfiles/Gemfile.minitest.1.4.2 +0 -7
data/gemfiles/Gemfile.minitest.2.0.0 +0 -7
data/gemfiles/Gemfile.minitest.2.0.1 +0 -7
data/gemfiles/Gemfile.minitest.2.11.0 +0 -7
data/gemfiles/Gemfile.minitest.2.11.2 +0 -7
data/gemfiles/Gemfile.minitest.2.3.0 +0 -7
data/gemfiles/Gemfile.test-unit.2.0.0 +0 -7
data/gemfiles/Gemfile.test-unit.2.0.1 +0 -7
data/gemfiles/Gemfile.test-unit.2.0.3 +0 -7
data/init.rb +0 -3
data/lib/mocha/class_method.rb +0 -119
data/lib/mocha/integration/mini_test/nothing.rb +0 -19
data/lib/mocha/integration/mini_test/version_13.rb +0 -51
data/lib/mocha/integration/mini_test/version_140.rb +0 -51
data/lib/mocha/integration/mini_test/version_141.rb +0 -62
data/lib/mocha/integration/mini_test/version_142_to_172.rb +0 -62
data/lib/mocha/integration/mini_test/version_200.rb +0 -63
data/lib/mocha/integration/mini_test/version_201_to_222.rb +0 -63
data/lib/mocha/integration/mini_test/version_2110_to_2111.rb +0 -67
data/lib/mocha/integration/mini_test/version_2112_to_320.rb +0 -70
data/lib/mocha/integration/mini_test/version_230_to_2101.rb +0 -65
data/lib/mocha/integration/test_unit/gem_version_200.rb +0 -59
data/lib/mocha/integration/test_unit/gem_version_201_to_202.rb +0 -59
data/lib/mocha/integration/test_unit/gem_version_203_to_220.rb +0 -59
data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb +0 -65
data/lib/mocha/integration/test_unit/nothing.rb +0 -19
data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb +0 -58
data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb +0 -60
data/lib/mocha/integration.rb +0 -14
data/lib/mocha/mini_test.rb +0 -3
data/lib/mocha/module_method.rb +0 -16
data/lib/mocha/module_methods.rb +0 -14
data/lib/mocha/multiple_yields.rb +0 -20
data/lib/mocha/no_yields.rb +0 -11
data/lib/mocha/parameter_matchers/object.rb +0 -17
data/lib/mocha/pretty_parameters.rb +0 -28
data/lib/mocha/setup.rb +0 -9
data/lib/mocha/single_yield.rb +0 -18
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/acceptance_test_helper.rb +0 -41
data/test/acceptance/bug_18914_test.rb +0 -43
data/test/acceptance/bug_21465_test.rb +0 -34
data/test/acceptance/bug_21563_test.rb +0 -25
data/test/acceptance/exception_rescue_test.rb +0 -55
data/test/acceptance/expectations_on_multiple_methods_test.rb +0 -55
data/test/acceptance/expected_invocation_count_test.rb +0 -232
data/test/acceptance/failure_messages_test.rb +0 -64
data/test/acceptance/issue_272_test.rb +0 -52
data/test/acceptance/issue_65_test.rb +0 -63
data/test/acceptance/issue_70_test.rb +0 -55
data/test/acceptance/mocha_example_test.rb +0 -98
data/test/acceptance/mocha_test_result_test.rb +0 -84
data/test/acceptance/mock_test.rb +0 -100
data/test/acceptance/mock_with_initializer_block_test.rb +0 -51
data/test/acceptance/mocked_methods_dispatch_test.rb +0 -78
data/test/acceptance/multiple_expectations_failure_message_test.rb +0 -68
data/test/acceptance/optional_parameters_test.rb +0 -70
data/test/acceptance/parameter_matcher_test.rb +0 -337
data/test/acceptance/partial_mocks_test.rb +0 -47
data/test/acceptance/prepend_test.rb +0 -89
data/test/acceptance/raise_exception_test.rb +0 -39
data/test/acceptance/return_value_test.rb +0 -52
data/test/acceptance/sequence_test.rb +0 -192
data/test/acceptance/states_test.rb +0 -70
data/test/acceptance/stub_any_instance_method_defined_on_superclass_test.rb +0 -34
data/test/acceptance/stub_any_instance_method_test.rb +0 -280
data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb +0 -106
data/test/acceptance/stub_class_method_defined_on_class_test.rb +0 -78
data/test/acceptance/stub_class_method_defined_on_module_test.rb +0 -75
data/test/acceptance/stub_class_method_defined_on_superclass_test.rb +0 -112
data/test/acceptance/stub_everything_test.rb +0 -56
data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb +0 -93
data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb +0 -69
data/test/acceptance/stub_instance_method_defined_on_class_test.rb +0 -69
data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb +0 -75
data/test/acceptance/stub_instance_method_defined_on_module_test.rb +0 -78
data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb +0 -75
data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb +0 -70
data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb +0 -72
data/test/acceptance/stub_method_defined_on_module_and_aliased_test.rb +0 -39
data/test/acceptance/stub_module_method_test.rb +0 -163
data/test/acceptance/stub_test.rb +0 -52
data/test/acceptance/stubba_example_test.rb +0 -102
data/test/acceptance/stubba_test_result_test.rb +0 -66
data/test/acceptance/stubbing_error_backtrace_test.rb +0 -64
data/test/acceptance/stubbing_frozen_object_test.rb +0 -88
data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb +0 -48
data/test/acceptance/stubbing_method_unnecessarily_test.rb +0 -65
data/test/acceptance/stubbing_nil_test.rb +0 -61
data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb +0 -143
data/test/acceptance/stubbing_non_existent_class_method_test.rb +0 -157
data/test/acceptance/stubbing_non_existent_instance_method_test.rb +0 -147
data/test/acceptance/stubbing_non_public_any_instance_method_test.rb +0 -130
data/test/acceptance/stubbing_non_public_class_method_test.rb +0 -163
data/test/acceptance/stubbing_non_public_instance_method_test.rb +0 -143
data/test/acceptance/stubbing_on_non_mock_object_test.rb +0 -64
data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb +0 -35
data/test/acceptance/throw_test.rb +0 -45
data/test/acceptance/unexpected_invocation_test.rb +0 -25
data/test/acceptance/unstubbing_test.rb +0 -168
data/test/assertions.rb +0 -8
data/test/deprecation_disabler.rb +0 -15
data/test/execution_point.rb +0 -36
data/test/integration/mini_test_test.rb +0 -8
data/test/integration/shared_tests.rb +0 -174
data/test/integration/test_unit_test.rb +0 -8
data/test/method_definer.rb +0 -24
data/test/mini_test_result.rb +0 -90
data/test/minitest_result.rb +0 -49
data/test/simple_counter.rb +0 -13
data/test/test_helper.rb +0 -50
data/test/test_runner.rb +0 -58
data/test/test_unit_result.rb +0 -20
data/test/unit/any_instance_method_test.rb +0 -134
data/test/unit/array_inspect_test.rb +0 -16
data/test/unit/backtrace_filter_test.rb +0 -19
data/test/unit/cardinality_test.rb +0 -56
data/test/unit/central_test.rb +0 -100
data/test/unit/change_state_side_effect_test.rb +0 -41
data/test/unit/class_method_test.rb +0 -225
data/test/unit/class_methods_test.rb +0 -40
data/test/unit/configuration_test.rb +0 -38
data/test/unit/date_time_inspect_test.rb +0 -21
data/test/unit/exception_raiser_test.rb +0 -42
data/test/unit/expectation_list_test.rb +0 -82
data/test/unit/expectation_test.rb +0 -497
data/test/unit/hash_inspect_test.rb +0 -16
data/test/unit/hooks_test.rb +0 -29
data/test/unit/in_state_ordering_constraint_test.rb +0 -43
data/test/unit/method_matcher_test.rb +0 -28
data/test/unit/mock_test.rb +0 -342
data/test/unit/mockery_test.rb +0 -151
data/test/unit/module_methods_test.rb +0 -19
data/test/unit/multiple_yields_test.rb +0 -18
data/test/unit/no_yields_test.rb +0 -18
data/test/unit/object_inspect_test.rb +0 -39
data/test/unit/object_methods_test.rb +0 -46
data/test/unit/parameter_matchers/all_of_test.rb +0 -26
data/test/unit/parameter_matchers/any_of_test.rb +0 -26
data/test/unit/parameter_matchers/anything_test.rb +0 -21
data/test/unit/parameter_matchers/equals_test.rb +0 -25
data/test/unit/parameter_matchers/has_entries_test.rb +0 -51
data/test/unit/parameter_matchers/has_entry_test.rb +0 -129
data/test/unit/parameter_matchers/has_key_test.rb +0 -55
data/test/unit/parameter_matchers/has_value_test.rb +0 -57
data/test/unit/parameter_matchers/includes_test.rb +0 -102
data/test/unit/parameter_matchers/instance_of_test.rb +0 -25
data/test/unit/parameter_matchers/is_a_test.rb +0 -25
data/test/unit/parameter_matchers/kind_of_test.rb +0 -25
data/test/unit/parameter_matchers/not_test.rb +0 -26
data/test/unit/parameter_matchers/regexp_matches_test.rb +0 -46
data/test/unit/parameter_matchers/responds_with_test.rb +0 -32
data/test/unit/parameter_matchers/stub_matcher.rb +0 -27
data/test/unit/parameter_matchers/yaml_equivalent_test.rb +0 -25
data/test/unit/parameters_matcher_test.rb +0 -121
data/test/unit/receivers_test.rb +0 -66
data/test/unit/return_values_test.rb +0 -63
data/test/unit/sequence_test.rb +0 -104
data/test/unit/single_return_value_test.rb +0 -14
data/test/unit/single_yield_test.rb +0 -18
data/test/unit/state_machine_test.rb +0 -98
data/test/unit/string_inspect_test.rb +0 -11
data/test/unit/thrower_test.rb +0 -20
data/test/unit/yield_parameters_test.rb +0 -93

data/RELEASE.md CHANGED Viewed

@@ -1,5 +1,310 @@
 # 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
+* Fix regression introduced in v1.10.0 that meant `Object#inspect` was called unnecessarily (368abd98)
+* Warn when mock object receives invocations in another test - thanks to @nitishr (#442)
+* Avoid rubocop comments appearing in YARD-generated docs (d8019eed)
+### Internal changes
+* Replace `StubbedMethod#original_method` & `#original_visibility` attribute reader methods with instance variables - thanks to @nitishr (d917f332)
+* Set up `MochaExampleTest` & `StubbaExampleTest` as acceptance tests - thanks to @nitishr (4881cc58)
+* Delete unused `PrettyParameters` class - thanks to @nitishr (314ea922)
+## 1.11.1
+### External changes
+* The `reinstate_undocumented_behaviour_from_v1_9` 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)
+## 1.11.0
+### External changes
+* Add `Expectation#with_block_given` & `Expectation#with_no_block_given` (#441).
+  * Allows non-deprecated solution for #382. Thanks to @yemartin for reporting and to @techbelly & @nitishr for feedback.
+* Fix issue with non-Array arguments passed to `Expectation#multiple_yields` (#444).
+  * The undocumented behaviour is now properly supported and documented.
+### Internal changes
+* Move static YARD options from Rake task to `.yardopts` file - thanks to @nitishr (#429)
+* Simplify implementation of yielding functionality - thanks to @nitishr (#439)
+* Add missing require statement to `acceptance_test_helper.rb` (1070fc02)
+* Add some baseline acceptance tests for yielding behaviour (c2cac911)
+* Display a sponsor button on GitHub repo page (9fc5911b)
+* Use new Deprecation.warning behaviour in `Invocation#call` (932d1166)
+## 1.10.2
+* Optionally reinstate undocumented behaviour from v1.9. This introduces a new configuration option (`reinstate_undocumented_behaviour_from_v1_9`) to reinstate a couple of bits of undocumented behaviour from v1.9 which were changed in v1.10 without any prior deprecation warning (#438):
+  * The behaviour of `API#mock`, `API#stub` and `API#stub_everything` when called with a symbol as the first argument.
+  * The behaviour of `Expectation#yields` and `Expectation#multiple_yields` when the stubbed method is called without a block.
+## 1.10.1
+* Ensure ObjectMethods & ClassMethods included when API extended (43778756)
+* Fix regression in `any_instance` stubbing of methods on object which has an implementation of `#respond_to?` that depends on the object's internal state - thanks to @rafaelfranca for reporting & @nitishr for fixing (#432, #434, 469d4b17)
+## 1.10.0
+* Improve deprecation warning when requiring 'mocha/setup' (388f44d7)
+* Add documentation for Cucumber integration (13ab797b)
+* Add documentation about an undocumented feature of `API#mock`, `API#stub` & `API#stub_everything` being changed (7ed2e4e7, d30c1717)
+## 1.10.0.beta.1
+* Hide `ClassMethods#method_visibility` & `#method_exists?` methods to avoid clash with Rails (#428)
+## 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)
+## 1.4.0
+* Fix deprecation warning for `assert_nil` in `ClassMethodTest` (#308 & #309)
+* Display file and line number in deprecation warning - thanks to @chrisarcand (#310, #312 & #313)
+* Rename `mocha/mini_test.rb` to `mocha/minitest.rb` - thanks to @grosser (#320 & #322)
+* Fix warning when delegating to mock in Ruby 2.4 - thanks to @tjvc (#321 & #323)
+* Updates to Travis CI configuration ([73af600..9732726](https://github.com/freerange/mocha/compare/73af600...9732726) & 0426e5e)
+## 1.3.0
+* Ensure all tests run individually - thanks to @chrisroos (#267)
+* Update Travis CI build status badge to show master branch status (#264)
+* Correct RSpec section of the README - thanks to @myronmarston (0cc039c8)
+* Fix pretty printing of quotes in `String#mocha_inspect` (#215 & #223)
+* Add release instructions to README - thanks to @chrisroos (70a5febd & 3c664df7)
+* Require at least Ruby v1.8.7 in gemspec - thanks to @knappe (3e20be8e)
+* Remove redundant InstanceMethod#method_exists? - thanks to @chrisroos (8f58eddf)
+* Reduce risk of hitting bug 12832 in Ruby v2.3 - thanks to @chrisroos (#277 & eca7560c)
+* Fix JRuby build - thanks to @headius (jruby/jruby#4250) & @chrisroos (#274)
+* Add latest stable version of JRuby to Travis CI build matrix (#288)
+* Fix Ruby v1.8.7 builds on Travis CI (928b5a40 & 460dce5b)
+* Deprecate passing block to mock object constructor (#290)
+* Add a known issue to README for Ruby bug 12876 (#276)
+* Add Ruby 2.4 and ruby-head to Travis CI build matrix - thanks to @junaruga (#297)
+* Fix `Mocha::ParameterMatchers#includes` for `Array` values - thanks to @timcraft (#302)
+* Use faster container-based virtual environments for Travis CI builds (#305)
+* Rename `Mocha::ParameterMatchers::QueryStringMatches` to `QueryString` (#306)
+* Handle blank parameter value for query string matcher - thanks to @weynsee (#303 & #304)
+* Rename `Mocha::ParameterMatchers::QueryString` -> `EquivalentUri` (#307)
+* Use `do ... end` instead of `{ ... }` in acceptance tests - thanks to @chrisroos (#294)
 ## 1.2.1
 * Fixed #272. Workaround Ruby bug 12832 which caused interpreter to hang. See https://bugs.ruby-lang.org/issues/12832. Thanks to @chrisroos & @petems (6f1c8b9b, #273).
@@ -395,7 +700,7 @@ Hash with wrong number of entries.
 ## 0.5.0
-- Parameter Matchers - I’ve added a few Hamcrest-style parameter matchers which are designed to be used inside Expectation#with. The following matchers are currently available: anything(), includes(), has_key(), has_value(), has_entry(), all_of() & any_of(). More to follow soon. The idea is eventually to get rid of the nasty parameter_block option on Expectation#with.
+- Parameter Matchers - I've added a few Hamcrest-style parameter matchers which are designed to be used inside Expectation#with. The following matchers are currently available: anything(), includes(), has_key(), has_value(), has_entry(), all_of() & any_of(). More to follow soon. The idea is eventually to get rid of the nasty parameter_block option on Expectation#with.
   object = mock()
   object.expects(:method).with(has_key('key_1'))

data/Rakefile CHANGED Viewed

@@ -1,17 +1,22 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-require "bundler/setup"
-MOCHA_DOCS_HOST = ENV['MOCHA_DOCS_HOST'] || 'gofreerange.com'
+require 'bundler'
+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"
+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,35 +24,25 @@ task 'test' do
   end
 end
-namespace 'test' do
-  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"
+namespace 'test' do # rubocop:disable Metrics/BlockLength
+  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
-  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 = FileList['test/acceptance/*_test.rb']
     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 +50,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 +69,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 +79,18 @@ namespace 'test' do
       puts "#{test_case}: #{benchmark_test_case(test_case, iterations)} seconds."
     end
   end
+end
+task 'lint' do
+  if defined?(RuboCop::RakeTask)
+    RuboCop::RakeTask.new
+    Rake::Task['rubocop'].invoke
+  else
+    puts 'RuboCop not available - skipping linting'
+  end
 end
+# rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 def benchmark_test_case(klass, iterations)
   require 'benchmark'
   require 'mocha/detection/mini_test'
@@ -94,33 +98,35 @@ 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) } }
+      Minitest.seed = 1
+      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 +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
-  desc "Generate documentation"
-  task 'generate_docs' => ['clobber_yardoc', 'yardoc']
+  task 'checkout_docs_cname' do
+    `git checkout docs/CNAME`
+  end
-  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_js' do
+    `git checkout docs/js/app.js`
+    `git checkout docs/js/jquery.js`
   end
-end
-task 'release' => 'default' do
-  Rake::Task['publish_docs'].invoke
+  desc 'Generate documentation'
+  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname checkout_docs_js]
 end
+task 'release' => ['default', 'rubygems:release']

data/gemfiles/Gemfile.minitest.latest CHANGED Viewed

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

data/gemfiles/Gemfile.test-unit.latest CHANGED Viewed

@@ -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 CHANGED Viewed

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