Only safeguard internals from recursion

JonRowe · JonRowe · commit 95f1e86783d3 · 2025-05-05T18:33:10.000+01:00
diff --git a/rspec-mocks/lib/rspec/mocks/message_expectation.rb b/rspec-mocks/lib/rspec/mocks/message_expectation.rb
@@ -438,7 +438,7 @@ def initialize(error_generator, expectation_ordering, expected_from, method_doub
           @ordered = false
           @at_least = @at_most = @exactly = nil
 
-          self.invoking = false
+          self.invoking_internals = false
 
           # Initialized to nil so that we don't allocate an array for every
           # mock or stub. See also comment in `and_yield`.
@@ -475,7 +475,7 @@ def safe_invoke(parent_stub, *args, &block)
         ruby2_keywords :safe_invoke if respond_to?(:ruby2_keywords, true)
 
         def invoke(parent_stub, *args, &block)
-          if invoking
+          if invoking_internals
             safe_invoke_without_incrementing_received_count(parent_stub, *args, &block)
           else
             invoke_incrementing_actual_calls_by(1, true, parent_stub, *args, &block)
@@ -486,6 +486,7 @@ def invoke(parent_stub, *args, &block)
         def safe_invoke_without_incrementing_received_count(parent_stub, *args, &block)
           invoke_incrementing_actual_calls_by(0, false, parent_stub, *args, &block)
         end
+        ruby2_keywords :safe_invoke_without_incrementing_received_count if respond_to?(:ruby2_keywords, true)
 
         def invoke_without_incrementing_received_count(parent_stub, *args, &block)
           invoke_incrementing_actual_calls_by(0, true, parent_stub, *args, &block)
@@ -613,18 +614,18 @@ def exception_source_id
           @exception_source_id ||= "#{self.class.name} #{__id__}"
         end
 
-        def invoking
-          RSpec::Support.thread_local_data[:"__rspec_#{object_id}_invoking"]
+        def invoking_internals
+          RSpec::Support.thread_local_data[:"__rspec_#{object_id}_invoking_internals"]
         end
 
-        def invoking=(value)
-          RSpec::Support.thread_local_data[:"__rspec_#{object_id}_invoking"] = value
+        def invoking_internals=(value)
+          RSpec::Support.thread_local_data[:"__rspec_#{object_id}_invoking_internals"] = value
         end
 
         def invoke_incrementing_actual_calls_by(increment, allowed_to_fail, parent_stub, *args, &block)
-          args.unshift(orig_object) if yield_receiver_to_implementation_block?
+          self.invoking_internals = true
 
-          self.invoking = true
+          args.unshift(orig_object) if yield_receiver_to_implementation_block?
 
           if negative? || (allowed_to_fail && (@exactly || @at_most) && (@actual_received_count == @expected_received_count))
             # args are the args we actually received, @argument_list_matcher is the
@@ -639,13 +640,15 @@ def invoke_incrementing_actual_calls_by(increment, allowed_to_fail, parent_stub,
 
           @order_group.handle_order_constraint self
 
+          self.invoking_internals = false
+
           if implementation.present?
             implementation.call(*args, &block)
           elsif parent_stub
             parent_stub.invoke(nil, *args, &block)
           end
         ensure
-          self.invoking = false
+          self.invoking_internals = false
           @actual_received_count_write_mutex.synchronize do
             @actual_received_count += increment
           end
diff --git a/rspec-mocks/spec/rspec/mocks/partial_double_spec.rb b/rspec-mocks/spec/rspec/mocks/partial_double_spec.rb
@@ -61,6 +61,19 @@ def call(name)
         an_object.call :my_method
       end
 
+      # This is a regresion test for rspec/rspec#212 / rspec/rspec#213
+      it "supports nesting" do
+        nested = false
+        expect(object).to receive(:nested).twice do
+          unless nested
+            nested = true
+            object.nested
+          end
+        end
+
+        object.nested
+      end
+
       it "can disallow messages from being received" do
         expect(object).not_to receive(:fuhbar)
         expect_fast_failure_from(
