mocha 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a8a30148d21664268060ffa4e5f81d0f604af97f57242abb58acbd30292f111
-  data.tar.gz: cf698efc280a8ab7a1405934352f94902535321b102b1d4416c7e6fb01da5961
+  metadata.gz: e6e1cd848b633850f0774eb601a31b7c574658eaa1be031443a235410e73ef83
+  data.tar.gz: 67f6af8a50e7f0cbc294367eb04696e6f40a04d44c432b17cb9c534b006a6a65
 SHA512:
-  metadata.gz: 5a33373ad234b00171114c7515411411b1f304c2f570e4732fe3c667e0462cfc88ca18d013c65ad0dc1f6b5a1a87fba47a6bea6079113f44bd996cc8cfec3f50
-  data.tar.gz: 66cb8130eebc14db769d8752357db57ee55809b25e61646270570f245f1821edd3ea5f11e37f2cb9734a2eca354a616683f1403bbf29c11d4d5c3685d933e261
+  metadata.gz: 5508f0dce73db625638223279e9a51215fabbbaed47bd911c1a8359c81efad57aa32f7c3b672ad6b900e1848a4a31335102c3113319855f08a91997d85466264
+  data.tar.gz: 37c2d7c0b5eaf2650a47a83b431e2c437f30f9b6bc0b902133b4d238e11b15daa3c005c738098bf326e3bb0a38ef82376923f8ef0e6f892e8a180c6b04038729

data/Gemfile

@@ -22,7 +22,8 @@ if RUBY_VERSION >= '2.2.0'
   gem 'minitest'
 end
 if RUBY_VERSION >= '2.2.0'
-  gem 'rubocop', '<= 0.58.2'
+  gem 'jaro_winkler', '>= 1.5.5'
+  gem 'rubocop', '> 0.56', '<= 0.58.2'
 end
 if ENV['MOCHA_GENERATE_DOCS']
   gem 'redcarpet'

data/README.md

@@ -121,13 +121,7 @@ Follow the instructions for the relevant test framework in the [Bundler](#bundle
 
 #### 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.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.
-* 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.
+* Prior to v1.15.0 (when support for Ruby v1.8 was dropped), 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 v1.8. See `test/acceptance/stub_method_defined_on_module_and_aliased_test.rb` for an example of this behaviour.
 
 ### Usage
 

data/RELEASE.md

@@ -1,23 +1,53 @@
 # Release Notes
 
+## 2.5.0
+
+### External changes
+
+* Add metadata to gem specification, including `changelog_uri` (#608, eb1b8ea2) - thanks to @mattbrictson
+* Fix warnings in Ruby v3.4 (#672, #669) - thanks to @radville for reporting
+* Add warnings & notes about regressions, known issues, etc to release notes (#675, #676 & #677) - thanks to @davidstosik
+
+### Internal changes
+
+* Fix `jaro_winkler` compilation errors on MacOS (5c7d14cb)
+* Fix typos in `IncludesTest` test names (6fb5a5a6)
+* Fix `rubocop` version constraint for Ruby > v2.2.0 (d5c6b98a)
+
+## 2.4.5
+
+### External changes
+
+* Fix regression when stubbed method expects `Hash` but receives `ActionController::Parameters` object (#662, #664) - thanks to @evgeni for reporting and testing
+
 ## 2.4.4
 
 ### External changes
 
 * Fix regression when method expecting `Hash` parameter or keyword arguments is invoked with no arguments (#662, #663) - thanks to @vlad-pisanov for reporting
 
+**WARNING: This release includes a regression:**
+* A `NoMethodError` was raised when a stubbed method was expecting a `Hash`, but was invoked with an instance of `ActionController::Parameters`. See #662 for the report and #664 for the fix which was released in v2.4.5.
+
 ## 2.4.3
 
 ### External changes
 
 * Fix regression when matching `Hash` parameter or keyword arguments (#657, #660) - thanks to @josesei for reporting and testing
 
+**WARNING: This release inadvertently introduced a couple of regressions:**
+* A `NoMethodError` was raised when a stubbed method was expecting a `Hash`, but was invoked with no arguments, e.g. with `C.expects(:foo).with(bar: 42)` and invoking `C.expects(:foo)`. See #662 for the report and #663 for the fix which was released in v2.4.4.
+* A `NoMethodError` was raised when a stubbed method was expecting a `Hash`, but was invoked with an instance of `ActionController::Parameters`. See #662 for the report and #664 for the fix which was released in v2.4.5.
+
 ## 2.4.2
 
 ### External changes
 
 * Don't trust `Object#is_a?` in presence of mock objects (#656) - thanks to @casperisfine
 
+**WARNING: This release includes a regression:**
+* Keyword argument and top-level `Hash` matching became more relaxed than intended, e.g. `mock.expects(:method).with(key: "value")` accepted `mock.method(key: "value", key2: "value")` when it should not have done. See #657 & #675 for the reports and #660 for the fix which was released in v2.4.3.
+
 ## 2.4.1
 
 ### External changes
@@ -29,6 +59,9 @@
 * Reduce duplication & consolidate `#to_matcher` method definitions (600ee2aa, e9de64e4, #655)
 * Change `#to_matcher` method to use keyword arguments (3b60b7df, #655)
 
+**WARNING: This release includes a regression:**
+* Keyword argument and top-level `Hash` matching became more relaxed than intended, e.g. `mock.expects(:method).with(key: "value")` accepted `mock.method(key: "value", key2: "value")` when it should not have done. See #657 & #675 for the reports and #660 for the fix which was released in v2.4.3.
+
 ## 2.4.0
 
 ### External changes
@@ -37,6 +70,10 @@
 
 ### Internal changes
 
+**WARNING: This release includes a couple of regressions:**
+* Nested parameter matching for keyword arguments became more relaxed than intended, e.g. `mock.expects(:method).with(has_entry(:k1, k2: 'v2'))` accepted `mock.method(k1: { k2: 'v2', k3: 'v3' })` when it should not have done. See #654 for the report and #655 for the fix which was released in v2.4.1.
+* Keyword argument and top-level `Hash` matching became more relaxed than intended, e.g. `mock.expects(:method).with(key: "value")` accepted `mock.method(key: "value", key2: "value")` when it should not have done. See #657 & #675 for the reports and #660 for the fix which was released in v2.4.3.
+
 * Improvements to `#mocha_inspect` unit tests (#650)
 
 ## 2.3.0
@@ -45,6 +82,10 @@
 
 * Fix nested parameter matching for keyword arguments (f94e2504, #648) - thanks to @CodingAnarchy for reporting
 
+**WARNING: This release inadvertently introduced a couple of regressions:**
+* Nested parameter matching for keyword arguments became more relaxed than intended, e.g. `mock.expects(:method).with(has_entry(:k1, k2: 'v2'))` accepted `mock.method(k1: { k2: 'v2', k3: 'v3' })` when it should not have done. See #654 for the report and #655 for the fix which was released in v2.4.1.
+* Keyword argument and top-level `Hash` matching became more relaxed than intended, e.g. `mock.expects(:method).with(key: "value")` accepted `mock.method(key: "value", key2: "value")` when it should not have done. See #657 & #675 for the reports and #660 for the fix which was released in v2.4.3.
+
 ## 2.2.0
 
 ### External changes
@@ -316,6 +357,9 @@ from the Ruby v1.8 standard library are no longer supported (#540,969f4845)
 * Add documentation for Cucumber integration (13ab797b)
 * Add documentation about an undocumented feature of `API#mock`, `API#stub` & `API#stub_everything` being changed (7ed2e4e7, d30c1717)
 
+**WARNING: This release inadvertently changed some undocumented behaviour:**
+* 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.
+
 ## 1.10.0.beta.1
 
 * Hide `ClassMethods#method_visibility` & `#method_exists?` methods to avoid clash with Rails (#428)
@@ -459,6 +503,9 @@ from the Ruby v1.8 standard library are no longer supported (#540,969f4845)
 * Fix typo in docs for equals - thanks to @alexcoco (#254)
 * Add known issue for Ruby v1.8 to README - thanks to @chrisroos (2c642096)
 
+**WARNING: This release inadvertently introduced the possibility of causing the Ruby interpreter to hang:**
+* 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.
+
 ## 1.1.0
 
 * Set visibility of any instance stub method.
@@ -467,6 +514,9 @@ from the Ruby v1.8 standard library are no longer supported (#540,969f4845)
 * Use GitHub convention for instructions on contributing to Mocha.
 * Fix typos in docs. Thanks to @10io
 
+**WARNING: This release inadvertently introduced the possibility of causing the Ruby interpreter to hang:**
+* From this release onwards, prepended modules have been used 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.
+
 ## 1.0.0
 
 ### External changes
@@ -529,6 +579,9 @@ relevant patch version.
 * Adapt Mocha acceptance tests to cope with changes in output from latest (v4.6.2) of MiniTest.
 * Updates to README about Rails compatibility.
 
+**NOTE: This release inadvertently caused deprecation warnings in some contexts:**
+* When used with Rails v3.2.0-v3.2.12, v3.1.0-v3.1.10 & v3.0.0-v3.0.19.
+
 ## 0.13.2
 * Stubbing of methods re-declared with different visibilty. Fixes #109.
 * Add `Mock#responds_like_instance_of`. Fixes #119.
@@ -538,10 +591,16 @@ relevant patch version.
 * Add a Gem Badge to provide a link to Mocha on Rubygems.
 * Make documentation example consistent with other examples.
 
+**NOTE: This release inadvertently caused deprecation warnings in some contexts:**
+* When used with Rails v3.2.0-v3.2.12, v3.1.0-v3.1.10 & v3.0.0-v3.0.19.
+
 ## 0.13.1
 * Fix #97 - `Mocha::ParameterMatchers#has_entry` does not work with an Array as the entry's value. Thanks to @ngokli.
 * Allow deprecation `:debug` mode to be switched on from `MOCHA_OPTIONS` environment variable.
 
+**NOTE: This release inadvertently caused deprecation warnings in some contexts:**
+* When used with Rails v3.2.0-v3.2.12, v3.1.0-v3.1.10 & v3.0.0-v3.0.19.
+
 ## 0.13.0
 * Major overhaul of MiniTest & Test::Unit integration. Mocha now integrates with later versions of the two test libraries using documented hooks rather than monkey-patching. This should mean that Mocha will integrate with new versions of either library without the need to release a new version of Mocha each time, which was clearly bad and unsustainable. Many thanks to @tenderlove, @zenspider & @kou for their help, suggestions & patience.
 * Temporarily deprecated `require 'mocha'`. Use `require 'mocha/setup'` instead. The plan is that eventually `require 'mocha'` will *not* automatically integrate with either of the two test libraries as it does at the moment, and you'll need to explicitly & separately trigger the integration. I think this will provide a lot more flexibility and will hopefully do away with the need for the `require: false` option in the `Gemfile` which has always confused people.
@@ -554,6 +613,9 @@ relevant patch version.
 * Various improvements to automated testing of integration with test libraries.
 * Make deprecation warnings more prominent.
 
+**NOTE: This release inadvertently caused deprecation warnings in some contexts:**
+* When used with Rails v3.2.0-v3.2.12, v3.1.0-v3.1.10 & v3.0.0-v3.0.19.
+
 ## 0.12.7
 * Officially support minitest v4.1.0 (still monkey-patching).
 
@@ -590,15 +652,27 @@ relevant patch version.
 ## 0.11.4
 * Homepage has moved to http://gofreerange.com/mocha/docs.
 
+**WARNING: This release inadvertently included a Rails compatibility issue:**
+* `TypeError: superclass mismatch for class ExpectationError` raised when using Rails v3.2.13. See #115.
+
 ## 0.11.3
 * Fix for #78 i.e. alias Object#method as Object#_method, not Object#__method__ which already exists as another Ruby method.
 
+**WARNING: This release inadvertently included a Rails compatibility issue:**
+* `TypeError: superclass mismatch for class ExpectationError` raised when using Rails v3.2.13. See #115.
+
 ## 0.11.2
 * Rails has a Request class which defines its own #method method. This broke the new mechanism for stubbing a method. This release includes a slightly modified version of fix #77 provided by @sikachu. See https://github.com/rails/rails/pull/5907 for further info.
 
+**WARNING: This release inadvertently included a Rails compatibility issue:**
+* `TypeError: superclass mismatch for class ExpectationError` raised when using Rails v3.2.13. See #115.
+
 ## 0.11.1
 * In Ruby 1.8.7 methods accepting a block parameter were incorrectly restored without the block parameter after being stubbed. Fix for #76.
 
+**WARNING: This release inadvertently included a Rails compatibility issue:**
+* `TypeError: superclass mismatch for class ExpectationError` raised when using Rails v3.2.13. See #115.
+
 ## 0.11.0
 * Store original method when stubbing rather than using alias_method. This fixes #41, #47, #74 and all tests now pass on both Ruby 1.8.7 and 1.9.3.
 * Attempting to stub a method on a frozen object should fail fast. See #68.
@@ -611,6 +685,11 @@ relevant patch version.
 * Improve documentation for ObjectMethods.
 * Provide a way to run multiple tests within a single acceptance test method.
 
+**WARNING: This release inadvertently included a significant bug - please do not use it!**
+
+**WARNING: This release inadvertently introduced a Rails compatibility issue:**
+* `TypeError: superclass mismatch for class ExpectationError` raised when using Rails v3.2.13. See #115.
+
 ## 0.10.5
 * Fix for issue #66 (hopefully without regressing on issue #63) - Mocha::Mock has Mocha::Mockery as a dependency. Stop trying to pretend otherwise. Thanks to @kennyj for reporting.
 * Fix a bunch of warnings in Ruby 1.9. There are still the 6 test failures mentioned in issue #41 which I suspect are due to the introspection gem not being Ruby 1.9-compatible.
@@ -629,9 +708,13 @@ Hash with wrong number of entries.
 ## 0.10.3
 * Fix for issue #57. Gem::Requirement#=~ was only added in rubygems v1.8.0, but Object#=~ means the result of various monkey-patching checks is always false/nil for earlier versions of rubygems. However, the method it aliases #satisfied_by? has existed since Gem::Dependency was extracted from Gem::Version in rubygems v0.9.4.4, so it's much safer to use that. Thanks to fguillen for reporting and helping with diagnosis.
 
+**WARNING: This release inadvertently included a significant bug - please do not use it!**
+
 ## 0.10.2
 * Merge pull request #53. Unstubbing a method should not remove expectations for other stubbed methods. Fixes #52. Thanks to saikat.
 
+**WARNING: This release inadvertently included a significant bug - please do not use it!**
+
 ## 0.10.1
 * Merge pull request #51. Use Gem::Requirement & Gem::Version for version comparison. Fixes issue #50. Thanks to meineerde.
 * Fixed typo in rdoc for Mocha::ObjectMethods.

data/lib/mocha/mockery.rb

@@ -114,11 +114,11 @@ module Mocha
     end
 
     def mocha_inspect
-      message = ''
-      message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" if unsatisfied_expectations.any?
-      message << "satisfied expectations:\n- #{satisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" if satisfied_expectations.any?
-      message << "states:\n- #{state_machines.map(&:mocha_inspect).join("\n- ")}\n" if state_machines.any?
-      message
+      lines = []
+      lines << "unsatisfied expectations:\n- #{unsatisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" if unsatisfied_expectations.any?
+      lines << "satisfied expectations:\n- #{satisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" if satisfied_expectations.any?
+      lines << "states:\n- #{state_machines.map(&:mocha_inspect).join("\n- ")}\n" if state_machines.any?
+      lines.join
     end
 
     def on_stubbing(object, method)

data/lib/mocha/parameter_matchers/has_entries.rb

@@ -39,7 +39,8 @@ module Mocha
       def matches?(available_parameters)
         parameter = available_parameters.shift
         return false unless parameter
-        return false if @exact && @entries.length != parameter.length
+        return false unless parameter.respond_to?(:keys)
+        return false if @exact && @entries.length != parameter.keys.length
 
         has_entry_matchers = @entries.map { |key, value| HasEntry.new(key, value) }
         AllOf.new(*has_entry_matchers).matches?([parameter])

data/lib/mocha/ruby_version.rb

@@ -1,3 +1,4 @@
 module Mocha
   RUBY_V27_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.7')
+  RUBY_V34_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('3.4')
 end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '2.4.4'.freeze
+  VERSION = '2.5.0'.freeze
 end

data/mocha.gemspec

@@ -21,6 +21,14 @@ Gem::Specification.new do |s|
   s.homepage = 'https://mocha.jamesmead.org'
   s.require_paths = ['lib']
   s.summary = 'Mocking and stubbing library'
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/freerange/mocha/issues',
+    'changelog_uri' => 'https://github.com/freerange/mocha/blob/main/RELEASE.md',
+    'documentation_uri' => 'https://mocha.jamesmead.org/',
+    'funding_uri' => 'https://github.com/sponsors/floehopper',
+    'homepage_uri' => s.homepage,
+    'source_code_uri' => 'https://github.com/freerange/mocha'
+  }
 
   s.add_runtime_dependency 'ruby2_keywords', '>= 0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -132,7 +132,13 @@ homepage: https://mocha.jamesmead.org
 licenses:
 - MIT
 - BSD-2-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/freerange/mocha/issues
+  changelog_uri: https://github.com/freerange/mocha/blob/main/RELEASE.md
+  documentation_uri: https://mocha.jamesmead.org/
+  funding_uri: https://github.com/sponsors/floehopper
+  homepage_uri: https://mocha.jamesmead.org
+  source_code_uri: https://github.com/freerange/mocha
 post_install_message:
 rdoc_options: []
 require_paths: