mocha 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2fb97d6eb77787f83c9199c83fcadd3605a07ec431a5e3d47a0d2ee6ff2c67
-  data.tar.gz: 42815979d195d003a14b42f36c4818fa6b1ca59d498e5ca3b743338a6dc13af8
+  metadata.gz: 427e4fdcdcceac0496dd9ad52802ae29be41ba102de0888e58f6c379c77ac24e
+  data.tar.gz: d2c3e87c6d5f861f1ae2124b758fd548e19f2299e1ebe69551b7483d0941516d
 SHA512:
-  metadata.gz: 8b3494f44f9b603513afa227fd58f499275155695ae2c5e6759f11a0288d4f0fc706d2be90c01e12b8166caf328a8caf543303671310f91a4e3f28b130319973
-  data.tar.gz: d8b24445529930e616433246b41e43c78f034842967dff64df9c026be1dab5b5f3b671115d984608166caae6e7a73d253dc8e12bcca8b60514aefbd0520b9c76
+  metadata.gz: 7b82f53427cf92b742d97c551808e42f8b954148f7311f97bb52e4c1c15952515cce115e23022ce10a5d52e07238dc8ce7188d810de5f4a7e193ca59d72b2e4f
+  data.tar.gz: c345496f74391ca1b8b2f6a4b0d3947f30c119a89416c7f69037b064c6ca207a77607fa8bd93443152c196f4f5fef93cccc984c4a75040ee675d140237dd0f8b

data/RELEASE.md

@@ -1,11 +1,20 @@
 # Release Notes
 
+## 2.6.1
+
+### External changes
+
+* Fix logic for displaying deprecation warning for expectation with never cardinality (#686) - thanks to @davidstosik for reporting
+
 ## 2.6.0
 
 ### External changes
 
 * Expectation with never cardinality should display deprecation warning (#681) - thanks to @ducmtran for reporting and testing
 
+**WARNING: This release results in some incorrect deprecation warnings:**
+* The logic for displaying the deprecation warnings is fixed in v2.6.1 (#686).
+
 ### Internal changes
 
 * Simplify backtrace related assertions (#680)

data/lib/mocha/mock.rb

@@ -318,25 +318,31 @@ module Mocha
     ruby2_keywords(:method_missing)
 
     # @private
-    def handle_method_call(symbol, arguments, block)
+    def handle_method_call(symbol, arguments, block) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       check_expiry
       check_responder_responds_to(symbol)
       invocation = Invocation.new(self, symbol, arguments, block)
 
       matching_expectations = all_expectations.matching_expectations(invocation)
-      matching_expectation_allowing_invocation = matching_expectations.detect(&:invocations_allowed?)
-      matching_expectation_never_allowing_invocation = matching_expectations.detect(&:invocations_never_allowed?)
 
-      if matching_expectation_allowing_invocation
-        if matching_expectation_never_allowing_invocation
-          invocation_not_allowed_warning(invocation, matching_expectation_never_allowing_invocation)
-        end
-        matching_expectation_allowing_invocation.invoke(invocation)
-      else
-        matching_expectation_ignoring_order = all_expectations.match(invocation, ignoring_order: true)
-        if matching_expectation_ignoring_order || (!matching_expectation_ignoring_order && !@everything_stubbed)
-          raise_unexpected_invocation_error(invocation, matching_expectation_ignoring_order)
+      index = 0
+      never_allowed_expectation = nil
+      while index < matching_expectations.length
+        matching_expectation = matching_expectations[index]
+        if matching_expectation.invocations_never_allowed?
+          never_allowed_expectation = matching_expectation
+        elsif matching_expectation.invocations_allowed?
+          if never_allowed_expectation
+            invocation_not_allowed_warning(invocation, never_allowed_expectation)
+          end
+          return matching_expectation.invoke(invocation)
         end
+        index += 1
+      end
+
+      matching_expectation_ignoring_order = all_expectations.match(invocation, ignoring_order: true)
+      if matching_expectation_ignoring_order || (!matching_expectation_ignoring_order && !@everything_stubbed) # rubocop:disable Style/GuardClause
+        raise_unexpected_invocation_error(invocation, matching_expectation_ignoring_order)
       end
     end
 

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '2.6.0'.freeze
+  VERSION = '2.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-24 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords