rspec-mocks 3.12.0 → 3.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd2152d61378a0a88fff67002f2fb7654e420b8e05dae14a9a0dee53be75158
-  data.tar.gz: ae2927214cf12da04ea1301bda73e04663293bd8afce3e028d2937ccfee7332e
+  metadata.gz: 51d2892643ca24dce94963c553f2fdee71d55d9c3c2b2d14ba4fb2cb4ed0876a
+  data.tar.gz: ceb42a276b994afe0eaffe46e3a7f314393caf5ba39a5804969b955dc9f309d0
 SHA512:
-  metadata.gz: 19e1b47dd79167753c4f551006b20ec2b3f72ebdf3cd02d10c94c78fe14c5ff808de8a2dcd0b622723aee7c3454bc67f817477edbe877ba181244548d0725956
-  data.tar.gz: 326636f36eb006d142e59b62477c4014a539157bdff50d6e06be4236e00df2eb824e4939f709192d538196a6dd223d7d2efae4bb21fe7392a02afc7744789c9a
+  metadata.gz: 3d19a308278d05b7703dafc5a88ca5b897badd3e60619fce025937b2ee677e36bea53f9ff2386b4180d107ce45dc695fecb68c69e46d0a4d0ec8063126d30b5f
+  data.tar.gz: dd881cdd051593ef697cab19d41b760933daca59768ad12430551743936d4373c575f2cc8cfe496e955e90b3cd965d14ec1f2b097c66f63e5e35e34d720696d9

data/Changelog.md

@@ -1,5 +1,63 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.0...3-12-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.6...3-12-maintenance)
+
+### 3.12.6 / 2023-07-11
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.5...v3.12.6)
+
+Bug Fixes:
+
+* Fix an issue with `and_call_original` when using the `method_missing` fallback
+  with keyword arguments. (Igor Drozdov, #1552)
+
+### 3.12.5 / 2023-03-30
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.4...v3.12.5)
+
+Bug Fixes:
+
+* Fix compatibility issue with Rails where active_support monkey patches `with`
+  when using any instance. (Lachlan Sylvester, #1540)
+
+### 3.12.4 / 2023-03-12
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.3...v3.12.4)
+
+Bug Fixes:
+
+* Fix an issue with asserting that Array#reverse is never called. (Brad Trick, #1533)
+* Fix compatibility issue with Rails where active_support monkey patches `with`.
+  (Jean Boussier, #1531, #1534)
+
+### 3.12.3 / 2023-01-17
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.2...v3.12.3)
+
+Bug Fixes:
+
+* Fix keyword delegation in `send` for verifying doubles on Ruby 3.
+  (Charlie Honig, #1485)
+
+### 3.12.2 / 2023-01-07
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.1...v3.12.2)
+
+Bug Fixes:
+
+* Fix implementation blocks for mocks using keyword arguments on Ruby 3.2.0.
+  (Adam Steel, #1508)
+* Fix keyword argument assertions when mocking using `with` on Ruby 3.2.0.
+  (Slava Kardakov, Benoit Tigeot, Phil Pirozhkov, Benoit Daloze, #1514)
+
+### 3.12.1 / 2022-12-10
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.12.0...v3.12.1)
+
+Bug Fixes:
+
+* Remove empty diff marker when a diff only contains console codes. (Jon Rowe, #1506)
+* Show keyword vs hash diff marker when arguments are not `==` (Jon Rowe, #1506)
+* Change check to detect frozen objects to rescue errors rather than
+  pre-empting by checking `frozen?` due to some objects mis-behaving.
+  (Keegan Roth, #1401)
+* Prevent unfulfilled expectations using `expect_any_instance_of` across a class
+  inheritance boundary from raising rather than failing. (Jon Rowe, #1496)
+* Prevent a misleading error message when using `allow(...).not_to` with
+  unsupported matchers. (Phil Pirozhkov, #1503)
 
 ### 3.12.0 / 2022-10-26
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.11.2...v3.12.0)

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

@@ -49,7 +49,7 @@ module RSpec
         # @private
         def unfulfilled_expectations
           @chains_by_method_name.map do |method_name, chains|
-            method_name.to_s if ExpectationChain === chains.last unless chains.last.expectation_fulfilled?
+            method_name.to_s if ExpectationChain === chains.last && !chains.last.expectation_fulfilled?
           end.compact
         end
 

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

@@ -10,7 +10,7 @@ module RSpec
       #
       # This proxy sits in front of the recorder and delegates both to it
       # and to the `RSpec::Mocks::Proxy` for each already mocked or stubbed
-      # instance of the class, in order to propogates changes to the instances.
+      # instance of the class, in order to propagates changes to the instances.
       #
       # Note that unlike `RSpec::Mocks::Proxy`, this proxy class is stateless
       # and is not persisted in `RSpec::Mocks.space`.
@@ -83,6 +83,15 @@ module RSpec
         end
       end
 
+      unless defined?(BasicObject)
+        class BasicObject
+          # Remove all methods except those expected to be defined on BasicObject
+          (instance_methods.map(&:to_sym) - [:__send__, :"!", :instance_eval, :==, :instance_exec, :"!=", :equal?, :__id__, :__binding__, :object_id]).each do |method|
+            undef_method method
+          end
+        end
+      end
+
       # @private
       # Delegates messages to each of the given targets in order to
       # provide the fluent interface that is available off of message
@@ -91,12 +100,12 @@ module RSpec
       # `targets` will typically contain 1 of the `AnyInstance::Recorder`
       # return values and N `MessageExpectation` instances (one per instance
       # of the `any_instance` klass).
-      class FluentInterfaceProxy
+      class FluentInterfaceProxy < BasicObject
         def initialize(targets)
           @targets = targets
         end
 
-        if RUBY_VERSION.to_f > 1.8
+        if ::RUBY_VERSION.to_f > 1.8
           def respond_to_missing?(method_name, include_private=false)
             super || @targets.first.respond_to?(method_name, include_private)
           end

data/lib/rspec/mocks/argument_list_matcher.rb

@@ -61,7 +61,9 @@ module RSpec
         return false if expected_args.size != actual_args.size
 
         if RUBY_VERSION >= "3"
-          # if both arguments end with Hashes, and if one is a keyword hash and the other is not, they don't match
+          # If the expectation was set with keywords, while the actual method was called with a positional hash argument, they don't match.
+          # If the expectation was set without keywords, e.g., with({a: 1}), then it fine to call it with either foo(a: 1) or foo({a: 1}).
+          # This corresponds to Ruby semantics, as if the method was def foo(options).
           if Hash === expected_args.last && Hash === actual_args.last
             if !Hash.ruby2_keywords_hash?(actual_args.last) && Hash.ruby2_keywords_hash?(expected_args.last)
               return false

data/lib/rspec/mocks/error_generator.rb

@@ -269,13 +269,19 @@ module RSpec
         expected_args = format_args(expectation.expected_args)
         actual_args = format_received_args(args_for_multiple_calls)
 
-        if RSpec::Support::RubyFeatures.distincts_kw_args_from_positional_hash? && expected_args == actual_args
+        if RSpec::Support::RubyFeatures.distincts_kw_args_from_positional_hash?
           expected_hash = expectation.expected_args.last
           actual_hash = args_for_multiple_calls.last.last
           if Hash === expected_hash && Hash === actual_hash &&
             (Hash.ruby2_keywords_hash?(expected_hash) != Hash.ruby2_keywords_hash?(actual_hash))
-            actual_args += Hash.ruby2_keywords_hash?(actual_hash) ? " (keyword arguments)" : " (options hash)"
-            expected_args += Hash.ruby2_keywords_hash?(expected_hash) ? " (keyword arguments)" : " (options hash)"
+
+            actual_description = Hash.ruby2_keywords_hash?(actual_hash) ? " (keyword arguments)" : " (options hash)"
+            expected_description = Hash.ruby2_keywords_hash?(expected_hash) ? " (keyword arguments)" : " (options hash)"
+
+            if actual_description != expected_description
+              actual_args += actual_description
+              expected_args += expected_description
+            end
           end
         end
 
@@ -283,7 +289,11 @@ module RSpec
 
         if args_for_multiple_calls.one?
           diff = diff_message(expectation.expected_args, args_for_multiple_calls.first)
-          message << "\nDiff:#{diff}" unless diff.strip.empty?
+          if RSpec::Mocks.configuration.color?
+            message << "\nDiff:#{diff}" unless diff.gsub(/\e\[\d+m/, '').strip.empty?
+          else
+            message << "\nDiff:#{diff}" unless diff.strip.empty?
+          end
         end
 
         message

data/lib/rspec/mocks/matchers/have_received.rb

@@ -16,7 +16,7 @@ module RSpec
           @subject = nil
         end
 
-        def name
+        def matcher_name
           "have_received"
         end
 

data/lib/rspec/mocks/matchers/receive.rb

@@ -13,7 +13,7 @@ module RSpec
           @recorded_customizations = []
         end
 
-        def name
+        def matcher_name
           "receive"
         end
 
@@ -55,8 +55,9 @@ module RSpec
           setup_any_instance_method_substitute(subject, :stub, block)
         end
 
+        own_methods = (instance_methods - superclass.instance_methods)
         MessageExpectation.public_instance_methods(false).each do |method|
-          next if method_defined?(method)
+          next if own_methods.include?(method)
 
           define_method(method) do |*args, &block|
             @recorded_customizations << ExpectationCustomization.new(method, args, block)

data/lib/rspec/mocks/matchers/receive_message_chain.rb

@@ -20,7 +20,7 @@ module RSpec
           end
         end
 
-        def name
+        def matcher_name
           "receive_message_chain"
         end
 

data/lib/rspec/mocks/matchers/receive_messages.rb

@@ -10,7 +10,7 @@ module RSpec
           @backtrace_line = CallerFilter.first_non_rspec_line
         end
 
-        def name
+        def matcher_name
           "receive_messages"
         end
 

data/lib/rspec/mocks/method_double.rb

@@ -2,6 +2,9 @@ module RSpec
   module Mocks
     # @private
     class MethodDouble
+      # @private TODO: drop in favor of FrozenError in ruby 2.5+
+      FROZEN_ERROR_MSG = /can't modify frozen/
+
       # @private
       attr_reader :method_name, :object, :expectations, :stubs, :method_stasher
 
@@ -23,10 +26,7 @@ module RSpec
         # handler of the object. This accounts for cases where the user has not
         # correctly defined `respond_to?`, and also 1.8 which does not provide
         # method handles for missing methods even if `respond_to?` is correct.
-        @original_implementation_callable ||= original_method ||
-          Proc.new do |*args, &block|
-            @object.__send__(:method_missing, @method_name, *args, &block)
-          end
+        @original_implementation_callable ||= original_method || method_missing_block
       end
 
       alias_method :save_original_implementation_callable!, :original_implementation_callable
@@ -37,6 +37,16 @@ module RSpec
           @proxy.original_method_handle_for(method_name)
       end
 
+      # @private
+      def method_missing_block
+        block = Proc.new do |*args, &b|
+          @object.__send__(:method_missing, @method_name, *args, &b)
+        end
+        block.ruby2_keywords if block.respond_to?(:ruby2_keywords)
+
+        block
+      end
+
       # @private
       def visibility
         @proxy.visibility_for(@method_name)
@@ -70,6 +80,14 @@ module RSpec
         end
 
         @method_is_proxied = true
+      rescue RuntimeError, TypeError => e
+        # TODO: drop in favor of FrozenError in ruby 2.5+
+        #  RuntimeError (and FrozenError) for ruby 2.x
+        #  TypeError for ruby 1.x
+        if (defined?(FrozenError) && e.is_a?(FrozenError)) || FROZEN_ERROR_MSG === e.message
+          raise ArgumentError, "Cannot proxy frozen objects, rspec-mocks relies on proxies for method stubbing and expectations."
+        end
+        raise
       end
 
       # The implementation of the proxied method. Subclasses may override this
@@ -83,7 +101,6 @@ module RSpec
 
       # @private
       def restore_original_method
-        return show_frozen_warning if object_singleton_class.frozen?
         return unless @method_is_proxied
 
         remove_method_from_definition_target
@@ -91,6 +108,14 @@ module RSpec
         restore_original_visibility
 
         @method_is_proxied = false
+      rescue RuntimeError, TypeError => e
+        # TODO: drop in favor of FrozenError in ruby 2.5+
+        #  RuntimeError (and FrozenError) for ruby 2.x
+        #  TypeError for ruby 1.x
+        if (defined?(FrozenError) && e.is_a?(FrozenError)) || FROZEN_ERROR_MSG === e.message
+          return show_frozen_warning
+        end
+        raise
       end
 
       # @private

data/lib/rspec/mocks/minitest_integration.rb

@@ -37,7 +37,7 @@ if defined?(::Minitest::Expectation)
     # not want to here (or else we would interfere with rspec-expectations' definition).
   else
     # ...otherwise, define those methods now. If `rspec/expectations/minitest_integration`
-    # is loaded after this file, it'll overide the defintion here.
+    # is loaded after this file, it'll override the definition here.
     Minitest::Expectation.class_eval do
       include RSpec::Mocks::ExpectationTargetMethods
 

data/lib/rspec/mocks/mutate_const.rb

@@ -81,7 +81,7 @@ module RSpec
       # Queries rspec-mocks to find out information about the named constant.
       #
       # @param [String] name the name of the constant
-      # @return [Constant] an object contaning information about the named
+      # @return [Constant] an object containing information about the named
       #   constant.
       def self.original(name)
         mutator = ::RSpec::Mocks.space.constant_mutator_for(name)

data/lib/rspec/mocks/proxy.rb

@@ -35,15 +35,9 @@ module RSpec
 
       # @private
       def ensure_can_be_proxied!(object)
-        return unless object.is_a?(Symbol) || object.frozen?
-        return if object.nil?
+        return unless object.is_a?(Symbol)
 
-        msg = "Cannot proxy frozen objects"
-        if Symbol === object
-          msg << ". Symbols such as #{object} cannot be mocked or stubbed."
-        else
-          msg << ", rspec-mocks relies on proxies for method stubbing and expectations."
-        end
+        msg = "Cannot proxy frozen objects. Symbols such as #{object} cannot be mocked or stubbed."
         raise ArgumentError, msg
       end
 
@@ -198,6 +192,7 @@ module RSpec
           @messages_received << [message, args, block]
         end
       end
+      ruby2_keywords :record_message_received if respond_to?(:ruby2_keywords, true)
 
       # @private
       def message_received(message, *args, &block)

data/lib/rspec/mocks/space.rb

@@ -77,9 +77,9 @@ module RSpec
 
       def reset_all
         proxies.each_value { |proxy| proxy.reset }
-        @constant_mutators.reverse.each { |mut| mut.idempotently_reset }
         any_instance_recorders.each_value { |recorder| recorder.stop_all_observation! }
         any_instance_recorders.clear
+        @constant_mutators.reverse.each { |mut| mut.idempotently_reset }
       end
 
       def register_constant_mutator(mutator)

data/lib/rspec/mocks/targets.rb

@@ -54,7 +54,7 @@ module RSpec
 
       def raise_negation_unsupported(method_name, matcher)
         raise NegationUnsupportedError,
-              "`#{expression}(...).#{method_name} #{matcher.name}` is not supported since it " \
+              "`#{expression}(...).#{method_name} #{matcher.matcher_name}` is not supported since it " \
               "doesn't really make sense. What would it even mean?"
       end
     end

data/lib/rspec/mocks/verifying_double.rb

@@ -42,11 +42,13 @@ module RSpec
       ensure
         @__sending_message = nil
       end
+      ruby2_keywords :__send__ if respond_to?(:ruby2_keywords, true)
       $VERBOSE = old
 
       def send(name, *args, &block)
         __send__(name, *args, &block)
       end
+      ruby2_keywords :send if respond_to?(:ruby2_keywords, true)
 
       def initialize(doubled_module, *args)
         @doubled_module = doubled_module

data/lib/rspec/mocks/verifying_proxy.rb

@@ -57,7 +57,7 @@ module RSpec
     # A verifying proxy mostly acts like a normal proxy, except that it
     # contains extra logic to try and determine the validity of any expectation
     # set on it. This includes whether or not methods have been defined and the
-    # validatiy of arguments on method calls.
+    # validity of arguments on method calls.
     #
     # In all other ways this behaves like a normal proxy. It only adds the
     # verification behaviour to specific methods then delegates to the parent
@@ -147,12 +147,12 @@ module RSpec
       end
 
       def add_expectation(*args, &block)
-        # explict params necessary for 1.8.7 see #626
+        # explicit params necessary for 1.8.7 see #626
         super(*args, &block).tap { |x| x.method_reference = @method_reference }
       end
 
       def add_stub(*args, &block)
-        # explict params necessary for 1.8.7 see #626
+        # explicit params necessary for 1.8.7 see #626
         super(*args, &block).tap { |x| x.method_reference = @method_reference }
       end
 
@@ -160,6 +160,7 @@ module RSpec
         validate_arguments!(args)
         super
       end
+      ruby2_keywords :proxy_method_invoked if respond_to?(:ruby2_keywords, true)
 
       def validate_arguments!(actual_args)
         @method_reference.with_signature do |signature|

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.0'
+      STRING = '3.12.6'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.12.6
 platform: ruby
 authors:
 - Steven Baker
 - David Chelimsky
 - Myron Marston
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -194,11 +194,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-mocks/issues
-  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.12.0/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.12.6/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: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -214,8 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
-summary: rspec-mocks-3.12.0
+summary: rspec-mocks-3.12.6
 test_files: []