mocha 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6e1cd848b633850f0774eb601a31b7c574658eaa1be031443a235410e73ef83
-  data.tar.gz: 67f6af8a50e7f0cbc294367eb04696e6f40a04d44c432b17cb9c534b006a6a65
+  metadata.gz: 427e4fdcdcceac0496dd9ad52802ae29be41ba102de0888e58f6c379c77ac24e
+  data.tar.gz: d2c3e87c6d5f861f1ae2124b758fd548e19f2299e1ebe69551b7483d0941516d
 SHA512:
-  metadata.gz: 5508f0dce73db625638223279e9a51215fabbbaed47bd911c1a8359c81efad57aa32f7c3b672ad6b900e1848a4a31335102c3113319855f08a91997d85466264
-  data.tar.gz: 37c2d7c0b5eaf2650a47a83b431e2c437f30f9b6bc0b902133b4d238e11b15daa3c005c738098bf326e3bb0a38ef82376923f8ef0e6f892e8a180c6b04038729
+  metadata.gz: 7b82f53427cf92b742d97c551808e42f8b954148f7311f97bb52e4c1c15952515cce115e23022ce10a5d52e07238dc8ce7188d810de5f4a7e193ca59d72b2e4f
+  data.tar.gz: c345496f74391ca1b8b2f6a4b0d3947f30c119a89416c7f69037b064c6ca207a77607fa8bd93443152c196f4f5fef93cccc984c4a75040ee675d140237dd0f8b

data/RELEASE.md

@@ -1,5 +1,25 @@
 # 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)
+* Remove unused `ExpectationList#match_but_out_of_order` (f2fa9919)
+
 ## 2.5.0
 
 ### External changes

data/lib/mocha/cardinality.rb

@@ -34,6 +34,10 @@ module Mocha
       @invocations.size < maximum
     end
 
+    def invocations_never_allowed?
+      maximum.zero?
+    end
+
     def satisfied?
       @invocations.size >= required
     end

data/lib/mocha/expectation.rb

@@ -653,6 +653,11 @@ module Mocha
       @cardinality.invocations_allowed?
     end
 
+    # @private
+    def invocations_never_allowed?
+      @cardinality.invocations_never_allowed?
+    end
+
     # @private
     def satisfied?
       @cardinality.satisfied?

data/lib/mocha/expectation_list.rb

@@ -21,14 +21,14 @@ module Mocha
       matching_expectations(invocation, ignoring_order: ignoring_order).first
     end
 
-    def match_but_out_of_order(invocation)
-      matching_expectations(invocation).first
-    end
-
     def match_allowing_invocation(invocation)
       matching_expectations(invocation).detect(&:invocations_allowed?)
     end
 
+    def match_never_allowing_invocation(invocation)
+      matching_expectations(invocation).detect(&:invocations_never_allowed?)
+    end
+
     def verified?(assertion_counter = nil)
       @expectations.all? { |expectation| expectation.verified?(assertion_counter) }
     end
@@ -53,8 +53,6 @@ module Mocha
       self.class.new(to_a + other.to_a)
     end
 
-    private
-
     def matching_expectations(invocation, ignoring_order: false)
       @expectations.select { |e| e.match?(invocation, ignoring_order: ignoring_order) }
     end

data/lib/mocha/mock.rb

@@ -8,6 +8,7 @@ require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/argument_iterator'
 require 'mocha/expectation_error_factory'
+require 'mocha/deprecation'
 
 module Mocha
   # Traditional mock object.
@@ -317,14 +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)
-      if (matching_expectation_allowing_invocation = all_expectations.match_allowing_invocation(invocation))
-        matching_expectation_allowing_invocation.invoke(invocation)
-      elsif (matching_expectation = all_expectations.match(invocation, ignoring_order: true)) || (!matching_expectation && !@everything_stubbed)
-        raise_unexpected_invocation_error(invocation, matching_expectation)
+
+      matching_expectations = all_expectations.matching_expectations(invocation)
+
+      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
 
@@ -369,6 +387,14 @@ module Mocha
 
     private
 
+    def invocation_not_allowed_warning(invocation, expectation)
+      messages = [
+        "The expectation defined at #{expectation.definition_location} does not allow invocations, but #{invocation.call_description} was invoked.",
+        'This invocation will cause the test to fail fast in a future version of Mocha.'
+      ]
+      Deprecation.warning(messages.join(' '))
+    end
+
     def raise_unexpected_invocation_error(invocation, matching_expectation)
       if @unexpected_invocation.nil?
         @unexpected_invocation = invocation

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '2.5.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.5.0
+  version: 2.6.1
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Mocking and stubbing library