Merge pull request #686 from freerange/fix-deprecation-warning-logic-…

…for-expectation-with-never-cardinality Fix never expectation deprecation warning logic
freerange · Nov 28, 2024 · 0b2923f · 0b2923f
2 parents 862237d + 01874f1
commit 0b2923f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/lib/mocha/mock.rb b/lib/mocha/mock.rb
@@ -318,25 +318,31 @@ def method_missing(symbol, *arguments, &block) # rubocop:disable Style/MethodMis
     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
 

diff --git a/test/acceptance/mocked_methods_dispatch_test.rb b/test/acceptance/mocked_methods_dispatch_test.rb
@@ -94,4 +94,18 @@ def test_should_display_deprecation_warning_if_invocation_matches_expectation_wi
     ]
     assert_equal expected.join(' '), message
   end
+
+  def test_should_not_display_deprecation_warning_if_invocation_matches_expectation_allowing_invocation_before_matching_expectation_with_never_cardinality
+    test_result = run_as_test do
+      mock = mock('mock')
+      mock.expects(:method).never
+      mock.expects(:method).once
+      Mocha::Deprecation.messages = []
+      DeprecationDisabler.disable_deprecations do
+        mock.method
+      end
+    end
+    assert_passed(test_result)
+    assert Mocha::Deprecation.messages.empty?
+  end
 end