rspec-mocks 3.13.3 → 3.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b76606e53f7acd8eea3d3e622b29c000c554d03b48454d66a85090a9b0b3525
-  data.tar.gz: a7832ad6bace4ab325cc5c2fa66384979e4155ad76f1dd5bb66b3533e15365cc
+  metadata.gz: 1ec56fe2f767262115b40aed338c0efccd4aa244cb5ce913e411a9952ec361fe
+  data.tar.gz: 744db38397a2f425482391df2f6a230396a4d67bbf52f42c383d57862d8415b1
 SHA512:
-  metadata.gz: e832958f3eb2444f16c0388d0f21a5c5ee796fd59e7c8fdd1e72f0a70bf1e0d1ad4e675ebca2917d6810f553a1c0e58b11336cc68a9bfadea8da7915602c382f
-  data.tar.gz: d1a7f0cabbde5140b2b50da89cce99507592ccca3ced5839bfc97b4cfa8fe3f663142b537fcc02cc779ba8fd146c67e101291732e13c980804e514ffe9a4b8dc
+  metadata.gz: 2813849f49563f48798d2e84f0139875eb1840d79ca6f295b30182d7c501047c2ab33463fb93f3eca31b31b6e861d8497b810a632fbb1461f63caf5ed338903d
+  data.tar.gz: f3ab9c0db0a688dce4ae84e4e2ed8f31980bcbec6bb98acc9889bcf6ac3d4e1707e6146b22e4889a348aba4ec602f97e9f1342967154ee452ea4a0f41ea008bd

data/Changelog.md

@@ -1,7 +1,27 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec/compare/rspec-mocks-v3.13.3...3-13-maintenance)
+[Full Changelog](https://github.com/rspec/rspec/compare/rspec-mocks-v3.13.5...3-13-maintenance)
 
-# 3.13.3 / 2025-05-01
+### 3.13.5 / 2025-05-27
+[Full Changelog](https://github.com/rspec/rspec/compare/rspec-mocks-v3.13.4...rspec-mocks-v3.13.5)
+
+Bug Fixes:
+
+* Fix regression where a previous fix (rspec/rspec#214) would leave behind thread data
+  between tests. (Jon Rowe, rspec/rspec#219)
+* Fix links in gemspec to point to monorepo / homepage. (Jon Rowe)
+
+### 3.13.4 / 2025-05-05
+[Full Changelog](https://github.com/rspec/rspec/compare/rspec-mocks-v3.13.3...rspec-mocks-v3.13.4)
+
+Bug Fixes:
+
+* Fix regression where nested stubbed method calls would inadvertently not be counted.
+  (Jon Rowe, rspec/rspec#214)
+* Fix regression where keyword arguments would not be passed through to nested stubbed
+  method calls. (Jon Rowe, rspec/rspec#214)
+
+### 3.13.3 / 2025-05-01
+[Full Changelog](https://github.com/rspec/rspec/compare/rspec-mocks-v3.13.2...rspec-mocks-v3.13.3)
 
 Bug Fixes:
 

data/lib/rspec/mocks/message_expectation.rb

@@ -439,7 +439,7 @@ module RSpec
           @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`.
@@ -476,7 +476,7 @@ module RSpec
         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)
@@ -487,6 +487,7 @@ module RSpec
         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)
@@ -614,18 +615,25 @@ module RSpec
           @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)
+          # We clear the key for this rather than setting to false because otherwise the amount of
+          # thread local data will keep growing over the lifetime of the thread (which is a long
+          # time on a single threaded spec run e.g standard MRI)
+          if value
+            RSpec::Support.thread_local_data[:"__rspec_#{object_id}_invoking_internals"] = true
+          else
+            RSpec::Support.thread_local_data.delete(:"__rspec_#{object_id}_invoking_internals")
+          end
         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
@@ -640,13 +648,15 @@ module RSpec
 
           @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

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.13.3'
+      STRING = '3.13.5'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.13.3
+  version: 3.13.5
 platform: ruby
 authors:
 - Steven Baker
@@ -43,7 +43,7 @@ cert_chain:
   AwP+qZPPf97FXXZGEGIYhhHpnj+Ltx9nCetRPiZ4rvYBcXgCWVQSg6eiEofrMwn/
   AKMCABhZ1Y2eATsfMgdkmIZk7JIPZiSi6eUxPiCMP9M/pw==
   -----END CERTIFICATE-----
-date: 2025-05-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -131,15 +131,16 @@ files:
 - lib/rspec/mocks/verifying_message_expectation.rb
 - lib/rspec/mocks/verifying_proxy.rb
 - lib/rspec/mocks/version.rb
-homepage: https://github.com/rspec/rspec-mocks
+homepage: https://rspec.info
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/rspec/rspec-mocks/issues
-  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.13.3/Changelog.md
+  bug_tracker_uri: https://github.com/rspec/rspec/issues
+  changelog_uri: https://github.com/rspec/rspec/blob/rspec-mocks-v3.13.5/rspec-mocks/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
-  source_code_uri: https://github.com/rspec/rspec-mocks
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/rspec/rspec/blob/rspec-mocks-v3.13.5/rspec-mocks
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
-summary: rspec-mocks-3.13.3
+summary: rspec-mocks-3.13.5
 test_files: []