mocha 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2fb97d6eb77787f83c9199c83fcadd3605a07ec431a5e3d47a0d2ee6ff2c67
-  data.tar.gz: 42815979d195d003a14b42f36c4818fa6b1ca59d498e5ca3b743338a6dc13af8
+  metadata.gz: 36441d2fc56cc4d162b3f1e790c6add3c70eebac844ec6e6b275ef1b6e5f268c
+  data.tar.gz: b63504e88684874b3609b91096bcd90d18f31639b3d32ba95e36f48e8fc67ecf
 SHA512:
-  metadata.gz: 8b3494f44f9b603513afa227fd58f499275155695ae2c5e6759f11a0288d4f0fc706d2be90c01e12b8166caf328a8caf543303671310f91a4e3f28b130319973
-  data.tar.gz: d8b24445529930e616433246b41e43c78f034842967dff64df9c026be1dab5b5f3b671115d984608166caae6e7a73d253dc8e12bcca8b60514aefbd0520b9c76
+  metadata.gz: 43c0128284d592878e833404f53f95a3c64bfeca18c85f7f94313b475566f98dc0993ed2b41a9d5118c1b4aabbb99e8848510d7aa3b4afa55804d67c0dd25658
+  data.tar.gz: d9b9785fbf25b80552a7f25e649a5e3ce08ef628c82a1dd36bccf260867156a4ac2c6cf1726e720c6ed8d836a8a1aa0e2441e29e869e65c244ac0c51f93c9423

data/Gemfile

@@ -25,6 +25,10 @@ if RUBY_VERSION >= '2.2.0'
   gem 'jaro_winkler', '>= 1.5.5'
   gem 'rubocop', '> 0.56', '<= 0.58.2'
 end
+if RUBY_ENGINE == 'jruby'
+  # Workaround for https://github.com/jruby/jruby/issues/8488
+  gem 'jar-dependencies', '~> 0.4.1'
+end
 if ENV['MOCHA_GENERATE_DOCS']
   gem 'redcarpet'
   gem 'yard'

data/README.md

@@ -276,7 +276,7 @@ Maybe, but probably not. Partial mocking changes the state of objects in the `Ob
 
 Stubs and expectations are basically the same thing. A stub is just an expectation of zero or more invocations. The `Expectation#stubs` method is syntactic sugar to make the intent of the test more explicit.
 
-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.
+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. If the expectation that matches the invocation has a cardinality of "never", then an unexpected invocation error is reported.
 
 See the [documentation](https://mocha.jamesmead.org/Mocha/Mock.html) for `Mocha::Mock` for further details.
 

data/RELEASE.md

@@ -1,11 +1,41 @@
 # Release Notes
 
+## 2.7.0
+
+### External changes
+
+* Fail fast if invocation matches never expectation (#679, #678, #490, #131 & #44) - thanks to @ducmtran & @davidstosik for reporting
+
+### Internal changes
+
+* Workaround for JRuby jar-dependencies issue (#690)
+* Ruby v3.4 stacktrace uses single-quote vs backtick (#688 & #689) - thanks to Vít Ondruch
+
+**WARNING: This release fixes a very _old_ bug**
+* The bug relates to the use of `Expectation#never` in combination with other expectations on the same method.
+* Please ensure you fix the relevant deprecation warnings when running against v2.6.1 *before* upgrading to v2.7.0.
+* Previously, the following test would have passed, but now it will fail with an unexpected invocation error on the `foo.bar` line.
+
+    foo = mock('foo')
+    foo.stubs(:bar)
+    foo.expects(:bar).never
+    foo.bar
+
+## 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

@@ -35,6 +35,9 @@ module Mocha
   # while an +expects(:foo).at_least_once+ expectation will always be matched
   # against invocations.
   #
+  # However, note that if the expectation that matches the invocation has a
+  # cardinality of "never", then an unexpected invocation error is reported.
+  #
   # This scheme allows you to:
   #
   # - Set up default stubs in your the +setup+ method of your test class and
@@ -318,25 +321,27 @@ 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
+      while index < matching_expectations.length
+        matching_expectation = matching_expectations[index]
+        if matching_expectation.invocations_never_allowed?
+          raise_unexpected_invocation_error(invocation, matching_expectation)
+        elsif matching_expectation.invocations_allowed?
+          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
 
@@ -381,14 +386,6 @@ 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.6.0'.freeze
+  VERSION = '2.7.0'.freeze
 end

metadata

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