rspec-mocks 3.12.6 → 3.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d2892643ca24dce94963c553f2fdee71d55d9c3c2b2d14ba4fb2cb4ed0876a
-  data.tar.gz: ceb42a276b994afe0eaffe46e3a7f314393caf5ba39a5804969b955dc9f309d0
+  metadata.gz: 560dd3294f2da199bebf87e99715e41d9a5859b2a47408121fe449b8614008e1
+  data.tar.gz: 0baffd51e9e653573998948c8057918b0e133caa13435026ad30a30848e15094
 SHA512:
-  metadata.gz: 3d19a308278d05b7703dafc5a88ca5b897badd3e60619fce025937b2ee677e36bea53f9ff2386b4180d107ce45dc695fecb68c69e46d0a4d0ec8063126d30b5f
-  data.tar.gz: dd881cdd051593ef697cab19d41b760933daca59768ad12430551743936d4373c575f2cc8cfe496e955e90b3cd965d14ec1f2b097c66f63e5e35e34d720696d9
+  metadata.gz: 3ec16d16de43a63521e1e89111df5b26b009e1dfa6738e802fb79c485a3894a4bdf60b63f08a5420c7a37934f367c93250f112d630f727a552c9ac86ece41b7a
+  data.tar.gz: 7a8e8e5b56dd7e362b7109bce4137c4f77a95eb50d1904fef38c2ff5cb28d605398b653ba9801ca8eab28b6c894d8f787275132d34193f031d7d10c305791e95

data/Changelog.md

@@ -1,5 +1,34 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.6...3-12-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.13.2...3-13-maintennace)
+
+### 3.13.2 / 2024-10-02
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.13.1...v3.13.2)
+
+Bug Fixes:
+
+* Support keyword arguments in callables passed to `and_invoke`. (Jon Rowe, #1595)
+
+### 3.13.1 / 2024-05-08
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.13.0...v3.13.1)
+
+Bug Fixes:
+
+* Use `RSpec::Support::Mutex` in `RSpec::Mocks::Proxy` to avoid issues from
+  stubbing `::Mutex#new`. (Eric Mueller, #1575)
+
+### 3.13.0 / 2024-02-04
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.7...v3.13.0)
+
+Enhancements:
+
+* Add an `array_excluding` matcher for arguments. (Zane Wolfgang Pickett, #1528)
+
+### 3.12.7 / 2024-02-04
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.6...v3.12.7)
+
+Bug Fixes:
+
+* Reduce allocations from "any_instance" style mocks. (Carlos Palhares, #1479)
 
 ### 3.12.6 / 2023-07-11
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.5...v3.12.6)

data/README.md

@@ -278,6 +278,8 @@ expect(double).to receive(:msg).with(1, duck_type(:abs, :div), "b") #2nd argumen
 expect(double).to receive(:msg).with(hash_including(:a => 5)) # first arg is a hash with a: 5 as one of the key-values
 expect(double).to receive(:msg).with(array_including(5)) # first arg is an array with 5 as one of the key-values
 expect(double).to receive(:msg).with(hash_excluding(:a => 5)) # first arg is a hash without a: 5 as one of the key-values
+expect(double).to receive(:msg).with(start_with('a')) # any matcher, custom or from rspec-expectations
+expect(double).to receive(:msg).with(satisfy { |data| data.dig(:a, :b, :c) == 5 }) # assert anything you want
 ```
 
 ## Receive Counts

data/lib/rspec/mocks/any_instance/recorder.rb

@@ -156,21 +156,23 @@ module RSpec
 
       private
 
-        def ancestor_is_an_observer?(method_name)
-          lambda do |ancestor|
-            unless ancestor == @klass
-              ::RSpec::Mocks.space.
-                any_instance_recorder_for(ancestor).already_observing?(method_name)
-            end
-          end
+        def ancestor_is_an_observer?(ancestor, method_name)
+          return if ancestor == @klass
+
+          ::RSpec::Mocks.space.
+            any_instance_recorder_for(ancestor).already_observing?(method_name)
         end
 
         def super_class_observers_for(method_name)
-          @klass.ancestors.select(&ancestor_is_an_observer?(method_name))
+          @klass.ancestors.select do |ancestor|
+            ancestor_is_an_observer?(ancestor, method_name)
+          end
         end
 
         def super_class_observing?(method_name)
-          @klass.ancestors.any?(&ancestor_is_an_observer?(method_name))
+          @klass.ancestors.any? do |ancestor|
+            ancestor_is_an_observer?(ancestor, method_name)
+          end
         end
 
         def normalize_chain(*args)

data/lib/rspec/mocks/argument_matchers.rb

@@ -71,6 +71,16 @@ module RSpec
         HashIncludingMatcher.new(ArgumentMatchers.anythingize_lonely_keys(*args))
       end
 
+      # Matches a hash that doesn't include the specified key(s) or key/value.
+      #
+      # @example
+      #   expect(object).to receive(:message).with(hash_excluding(:key => val))
+      #   expect(object).to receive(:message).with(hash_excluding(:key))
+      #   expect(object).to receive(:message).with(hash_excluding(:key, :key2 => :val2))
+      def hash_excluding(*args)
+        HashExcludingMatcher.new(ArgumentMatchers.anythingize_lonely_keys(*args))
+      end
+
       # Matches an array that includes the specified items at least once.
       # Ignores duplicates and additional values
       #
@@ -82,14 +92,14 @@ module RSpec
         ArrayIncludingMatcher.new(actually_an_array)
       end
 
-      # Matches a hash that doesn't include the specified key(s) or key/value.
+      # Matches an array that excludes the specified items.
       #
       # @example
-      #   expect(object).to receive(:message).with(hash_excluding(:key => val))
-      #   expect(object).to receive(:message).with(hash_excluding(:key))
-      #   expect(object).to receive(:message).with(hash_excluding(:key, :key2 => :val2))
-      def hash_excluding(*args)
-        HashExcludingMatcher.new(ArgumentMatchers.anythingize_lonely_keys(*args))
+      #   expect(object).to receive(:message).with(array_excluding(1,2,3))
+      #   expect(object).to receive(:message).with(array_excluding([1,2,3]))
+      def array_excluding(*args)
+        actually_an_array = Array === args.first && args.count == 1 ? args.first : args
+        ArrayExcludingMatcher.new(actually_an_array)
       end
 
       alias_method :hash_not_including, :hash_excluding
@@ -236,6 +246,8 @@ module RSpec
 
         def ===(actual)
           actual = actual.uniq
+          return true if (actual & @expected).count >= @expected.count
+
           @expected.uniq.all? do |expected_element|
             actual.any? do |actual_element|
               RSpec::Support::FuzzyMatcher.values_match?(expected_element, actual_element)
@@ -258,6 +270,38 @@ module RSpec
         end
       end
 
+      # @private
+      class ArrayExcludingMatcher
+        def initialize(unexpected)
+          @unexpected = unexpected.uniq
+        end
+
+        def ===(actual)
+          actual = actual.uniq
+          return false unless (actual & @unexpected).empty?
+
+          actual.none? do |actual_element|
+            @unexpected.any? do |unexpected_element|
+              RSpec::Support::FuzzyMatcher.values_match?(unexpected_element, actual_element)
+            end
+          end
+        rescue NoMethodError
+          false
+        end
+
+        def description
+          "array_excluding(#{formatted_unexpected_values})"
+        end
+
+      private
+
+        def formatted_unexpected_values
+          @unexpected.map do |x|
+            RSpec::Support.rspec_description_for_object(x)
+          end.join(", ")
+        end
+      end
+
       # @private
       class DuckTypeMatcher
         def initialize(*methods_to_respond_to)
@@ -312,7 +356,7 @@ module RSpec
         begin
           object.class.name.include?(matcher_namespace)
         rescue NoMethodError
-          # Some objects, like BasicObject, don't implemented standard
+          # Some objects, like BasicObject, don't implement standard
           # reflection methods.
           false
         end

data/lib/rspec/mocks/configuration.rb

@@ -156,7 +156,7 @@ module RSpec
       end
 
       # @private
-      # Used to track wether we are temporarily suppressing verifying partial
+      # Used to track whether we are temporarily suppressing verifying partial
       # doubles with `without_partial_double_verification { ... }`
       attr_accessor :temporarily_suppress_partial_double_verification
 

data/lib/rspec/mocks/message_expectation.rb

@@ -68,7 +68,7 @@ module RSpec
       #   counter.count # => 3
       #   counter.count # => 3
       #   # etc
-      def and_return(first_value, *values)
+      def and_return(first_value, *values, &_block)
         raise_already_invoked_error_if_necessary(__method__)
         if negative?
           raise "`and_return` is not supported with negative message expectations"
@@ -101,12 +101,12 @@ module RSpec
       #
       #   allow(api).to receive(:get_foo).and_invoke(-> { raise ApiTimeout }, -> { raise ApiTimeout }, -> { :a_foo })
       #   api.get_foo # => raises ApiTimeout
-      #   api.get_foo # => rasies ApiTimeout
+      #   api.get_foo # => raises ApiTimeout
       #   api.get_foo # => :a_foo
       #   api.get_foo # => :a_foo
       #   api.get_foo # => :a_foo
       #   # etc
-      def and_invoke(first_proc, *procs)
+      def and_invoke(first_proc, *procs, &_block)
         raise_already_invoked_error_if_necessary(__method__)
         if negative?
           raise "`and_invoke` is not supported with negative message expectations"
@@ -748,6 +748,7 @@ module RSpec
 
         proc.call(*args, &block)
       end
+      ruby2_keywords(:call) if respond_to?(:ruby2_keywords, true)
     end
 
     # Represents a configured implementation. Takes into account

data/lib/rspec/mocks/proxy.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'mutex'
+
 module RSpec
   module Mocks
     # @private
@@ -9,11 +11,6 @@ module RSpec
         end
       end
 
-      unless defined?(Mutex)
-        Support.require_rspec_support 'mutex'
-        Mutex = Support::Mutex
-      end
-
       # @private
       def ensure_implemented(*_args)
         # noop for basic proxies, see VerifyingProxy for behaviour.
@@ -27,7 +24,7 @@ module RSpec
         @order_group = order_group
         @error_generator = ErrorGenerator.new(object)
         @messages_received = []
-        @messages_received_mutex = Mutex.new
+        @messages_received_mutex = Support::Mutex.new
         @options = options
         @null_object = false
         @method_doubles = Hash.new { |h, k| h[k] = MethodDouble.new(@object, k, self) }

data/lib/rspec/mocks/syntax.rb

@@ -115,7 +115,7 @@ module RSpec
             Matchers::Receive.new(method_name, block)
           end
 
-          def receive_messages(message_return_value_hash)
+          def receive_messages(message_return_value_hash, &_block)
             matcher = Matchers::ReceiveMessages.new(message_return_value_hash)
             matcher.warn_about_block if block_given?
             matcher

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.12.6'
+      STRING = '3.13.2'
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.12.6
+  version: 3.13.2
 platform: ruby
 authors:
 - Steven Baker
 - David Chelimsky
 - Myron Marston
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -45,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +52,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +112,22 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -194,11 +199,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-mocks/issues
-  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.12.6/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.13.2/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
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -214,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
-summary: rspec-mocks-3.12.6
+summary: rspec-mocks-3.13.2
 test_files: []