ory-hydra-client 2.0.1 → 2.1.0

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/lib/parser/runner.rb

@@ -128,6 +128,11 @@ module Parser
         @parser_class = Parser::Ruby32
       end
 
+      opts.on '--33', 'Parse as Ruby 3.3 would' do
+        require 'parser/ruby33'
+        @parser_class = Parser::Ruby33
+      end
+
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do
         require 'parser/macruby'
         @parser_class = Parser::MacRuby

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/lib/parser/source/buffer.rb

@@ -191,11 +191,20 @@ module Parser
         end
       end
 
-      def slice(range)
+      def slice(start, length = nil)
+        if length.nil?
+          if start.is_a?(::Range)
+            length = start.size
+            start = start.begin
+          else
+            length = 1
+          end
+        end
+
         if @slice_source.nil?
-          @source[range]
+          @source[start, length]
         else
-          @slice_source[range].encode(@source.encoding)
+          @slice_source[start, length].encode(@source.encoding)
         end
       end
 

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/lib/parser/source/range.rb

@@ -130,7 +130,7 @@ module Parser
       # @return [String] all source code covered by this range.
       #
       def source
-        @source_buffer.slice(self.begin_pos...self.end_pos)
+        @source_buffer.slice(@begin_pos, @end_pos - @begin_pos)
       end
 
       ##

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/lib/parser/static_environment.rb

@@ -5,6 +5,8 @@ module Parser
   class StaticEnvironment
     FORWARD_ARGS = :FORWARD_ARGS
     ANONYMOUS_BLOCKARG = :ANONYMOUS_BLOCKARG
+    ANONYMOUS_RESTARG = :ANONYMOUS_RESTARG
+    ANONYMOUS_KWRESTARG = :ANONYMOUS_KWRESTARG
 
     def initialize
       reset
@@ -61,6 +63,22 @@ module Parser
       declared?(ANONYMOUS_BLOCKARG)
     end
 
+    def declare_anonymous_restarg
+      declare(ANONYMOUS_RESTARG)
+    end
+
+    def declared_anonymous_restarg?
+      declared?(ANONYMOUS_RESTARG)
+    end
+
+    def declare_anonymous_kwrestarg
+      declare(ANONYMOUS_KWRESTARG)
+    end
+
+    def declared_anonymous_kwrestarg?
+      declared?(ANONYMOUS_KWRESTARG)
+    end
+
     def empty?
       @stack.empty?
     end

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '3.1.2.1'
+  VERSION = '3.2.2.0'
 end

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/lib/parser.rb

@@ -64,7 +64,12 @@ module Parser
 
   require 'parser/static_environment'
 
-  require 'parser/lexer'
+  if RUBY_ENGINE == 'truffleruby'
+    require 'parser/lexer-F0'
+  else
+    require 'parser/lexer-F1'
+  end
+  require 'parser/lexer-strings'
   require 'parser/lexer/literal'
   require 'parser/lexer/stack_state'
   require 'parser/lexer/dedenter'

data/vendor/bundle/ruby/2.5.0/gems/{parser-3.1.2.1 → parser-3.2.2.0}/parser.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',   '>= 1.15', '< 3.0.0'
   spec.add_development_dependency 'rake',      '~> 13.0.1'
-  spec.add_development_dependency 'racc',      '= 1.4.15'
+  spec.add_development_dependency 'racc',      '= 1.6.2'
   spec.add_development_dependency 'cliver',    '~> 0.3.2'
 
   spec.add_development_dependency 'yard'

data/vendor/bundle/ruby/2.5.0/gems/psych-4.0.6/ext/psych/Makefile

@@ -31,8 +31,8 @@ rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
 vendorarchdir = $(rubysitearchprefix)/vendor_ruby/$(ruby_version)
 vendorlibdir = $(vendordir)/$(ruby_version)
 vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(DESTDIR)./.gem.20221027-4541-1dnn8rd
-sitelibdir = $(DESTDIR)./.gem.20221027-4541-1dnn8rd
+sitearchdir = $(DESTDIR)./.gem.20230407-4479-8hibfh
+sitelibdir = $(DESTDIR)./.gem.20230407-4479-8hibfh
 sitedir = $(DESTDIR)/usr/local/lib/site_ruby
 rubyarchdir = $(rubyarchprefix)/$(ruby_version)
 rubylibdir = $(rubylibprefix)/$(ruby_version)

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/Changelog.md

@@ -1,5 +1,13 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.12.0...3-12-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.12.1...3-12-maintenance)
+
+### 3.12.1 / 2023-02-03
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.12.0...v3.12.1)
+
+Bug fixes:
+
+* Prevent multiple calls to `extra_failure_lines` from adding additional whitespace
+  around them when the lines already contain whitespace. (Jon Rowe, #3006)
 
 ### 3.12.0 / 2022-10-26
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.11.0...v3.12.0)

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/README.md

@@ -322,14 +322,14 @@ Failures:
             got: nil
 
        (compared using ==)
-     # ./spec/calcalator_spec.rb:6:in `block (3 levels) in <top (required)>'
+     # ./spec/calculator_spec.rb:6:in `block (3 levels) in <top (required)>'
 
 Finished in 0.00131 seconds (files took 0.10968 seconds to load)
 1 example, 1 failure
 
 Failed examples:
 
-rspec ./spec/calcalator_spec.rb:5 # Calculator#add returns the sum of its arguments
+rspec ./spec/calculator_spec.rb:5 # Calculator#add returns the sum of its arguments
 ```
 
 Implement the simplest solution, by changing the definition of `Calculator#add` to:

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/lib/rspec/core/configuration.rb

@@ -678,7 +678,7 @@ module RSpec
       end
 
       # Set regular expressions used to exclude lines in backtrace.
-      # @param patterns [Array<Regexp>] set backtrace_formatter exlusion_patterns
+      # @param patterns [Array<Regexp>] set backtrace_formatter exclusion_patterns
       def backtrace_exclusion_patterns=(patterns)
         @backtrace_formatter.exclusion_patterns = patterns
       end
@@ -1820,7 +1820,7 @@ module RSpec
       #   by not setting `mock_with` or `expect_with` to anything else).
       #
       # @note If the user uses this options with `mock_with :mocha`
-      #   (or similiar) they will still have monkey patching active
+      #   (or similar) they will still have monkey patching active
       #   in their test environment from mocha.
       #
       # @example

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/lib/rspec/core/example_status_persister.rb

@@ -63,7 +63,7 @@ module RSpec
     # were loaded but not executed (due to filtering, `--fail-fast`
     # or whatever) should have a `:status` of `UNKNOWN_STATUS`.
     #
-    # This willl produce a new list that:
+    # This will produce a new list that:
     #   - Will be missing examples from previous runs that we know for sure
     #     no longer exist.
     #   - Will have the latest known status for any examples that either
@@ -164,7 +164,7 @@ module RSpec
       end
 
       def formatted_value_rows
-        @foramtted_value_rows ||= rows.map do |row|
+        @formatted_value_rows ||= rows.map do |row|
           formatted_row_from(row)
         end
       end

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/lib/rspec/core/formatters/exception_presenter.rb

@@ -197,8 +197,8 @@ module RSpec
           @extra_failure_lines ||= begin
             lines = Array(example.metadata[:extra_failure_lines])
             unless lines.empty?
-              lines.unshift('')
-              lines.push('')
+              lines.unshift('') unless lines.first == ''
+              lines.push('') unless lines.last == ''
             end
             lines
           end

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/lib/rspec/core/formatters/html_snippet_extractor.rb

@@ -43,7 +43,7 @@ module RSpec
         #
         # @param backtrace [String] the backtrace from a test failure
         # @return [String] highlighted code snippet indicating where the test
-        #   failure occured
+        #   failure occurred
         #
         # @see #post_process
         def snippet(backtrace)
@@ -103,7 +103,7 @@ module RSpec
         #
         # @param highlighted [String] syntax-highlighted snippet surrounding the
         #   offending line of code
-        # @param offending_line [Fixnum] line where failure occured
+        # @param offending_line [Fixnum] line where failure occurred
         # @return [String] completed snippet
         def post_process(highlighted, offending_line)
           new_lines = []

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/lib/rspec/core/metadata_filter.rb

@@ -92,7 +92,7 @@ module RSpec
       #
       # This is ideal for use by a example or example group, which may
       # be updated multiple times with globally configured hooks, etc,
-      # but will not be queried frequently by other examples or examle
+      # but will not be queried frequently by other examples or example
       # groups.
       # @private
       class UpdateOptimized

data/vendor/bundle/ruby/2.5.0/gems/{rspec-core-3.12.0 → rspec-core-3.12.1}/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.12.0'
+      STRING = '3.12.1'
     end
   end
 end

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/Changelog.md

@@ -1,5 +1,22 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.12.0...3-12-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.12.1...3-12-maintenance)
+
+### 3.12.2 / 2023-01-07
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.12.1...v3.12.2)
+
+Bug Fixes:
+
+* Prevent deprecation warning when using the `exist` matcher with `Dir`.
+  (Steve Dierker, #1398)
+
+### 3.12.1 / 2022-12-16
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.12.0...v3.12.1)
+
+Bug Fixes:
+
+* Pass keyword arguments through to aliased (and thus negated) matchers. (Jon Rowe, #1394)
+* When handling failures in an aggregated_failures block (or example) prevent
+  the failure list leaking out. (Maciek Rząsa, #1392)
 
 ### 3.12.0 / 2022-10-26
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.11.1...v3.12.0)

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/expectations/failure_aggregator.rb

@@ -4,6 +4,21 @@ module RSpec
     class FailureAggregator
       attr_reader :block_label, :metadata
 
+      # @private
+      class AggregatedFailure
+        # @private
+        MESSAGE =
+          'AggregatedFailure: This method caused a failure which has been ' \
+          'suppressed to be aggregated into our failure report by returning ' \
+          'this value, further errors can be ignored.'
+
+        def inspect
+          MESSAGE
+        end
+      end
+
+      AGGREGATED_FAILURE = AggregatedFailure.new
+
       def aggregate
         RSpec::Support.with_failure_notifier(self) do
           begin
@@ -48,6 +63,8 @@ module RSpec
         @seen_source_ids[source_id] = true
         assign_backtrace(failure) unless failure.backtrace
         failures << failure
+
+        AGGREGATED_FAILURE
       end
 
     private

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.12.0'
+      STRING = '3.12.2'
     end
   end
 end

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/matchers/aliased_matcher.rb

@@ -99,14 +99,14 @@ module RSpec
       # by going through the effort of defining a negated matcher.
       #
       # However, if the override didn't actually change anything, then we
-      # should return the opposite failure message instead -- the overriden
+      # should return the opposite failure message instead -- the overridden
       # message is going to be confusing if we return it as-is, as it represents
       # the non-negated failure message for a negated match (or vice versa).
       def optimal_failure_message(same, inverted)
         if DefaultFailureMessages.has_default_failure_messages?(@base_matcher)
           base_message = @base_matcher.__send__(same)
-          overriden    = @description_block.call(base_message)
-          return overriden if overriden != base_message
+          overridden    = @description_block.call(base_message)
+          return overridden if overridden != base_message
         end
 
         @base_matcher.__send__(inverted)

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/matchers/built_in/compound.rb

@@ -171,7 +171,7 @@ module RSpec
             @match_results.fetch(matcher) do
               raise ArgumentError, "Your #{matcher.description} has no match " \
                "results, this can occur when an unexpected call stack or " \
-               "local jump occurs. Prehaps one of your matchers needs to " \
+               "local jump occurs. Perhaps one of your matchers needs to " \
                "declare `expects_call_stack_jump?` as `true`?"
             end
           end

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/matchers/built_in/exist.rb

@@ -81,7 +81,7 @@ module RSpec
           end
 
           def deprecated(predicate, actual)
-            predicate == :exists? && (File == actual || FileTest == actual)
+            predicate == :exists? && (File == actual || FileTest == actual || Dir == actual)
           end
         end
       end

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/matchers/composable.rb

@@ -83,7 +83,7 @@ module RSpec
         RSpec::Support::ObjectFormatter.format(object)
       end
 
-      # Transforms the given data structue (typically a hash or array)
+      # Transforms the given data structure (typically a hash or array)
       # into a new data structure that, when `#inspect` is called on it,
       # will provide descriptions of any contained matchers rather than
       # the normal `#inspect` output.

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/matchers/dsl.rb

@@ -4,7 +4,7 @@ module RSpec
   module Matchers
     # Defines the custom matcher DSL.
     module DSL
-      # Defines a matcher alias. The returned matcher's `description` will be overriden
+      # Defines a matcher alias. The returned matcher's `description` will be overridden
       # to reflect the phrasing of the new name, which will be used in failure messages
       # when passed as an argument to another matcher in a composed matcher expression.
       #
@@ -25,7 +25,7 @@ module RSpec
       # @param old_name [Symbol] the original name for the matcher
       # @param options  [Hash] options for the aliased matcher
       # @option options [Class] :klass the ruby class to use as the decorator. (Not normally used).
-      # @yield [String] optional block that, when given, is used to define the overriden
+      # @yield [String] optional block that, when given, is used to define the overridden
       #   logic. The yielded arg is the original description or failure message. If no
       #   block is provided, a default override is used based on the old and new names.
       # @see RSpec::Matchers
@@ -40,10 +40,11 @@ module RSpec
           matcher.matcher_name = new_name if matcher.respond_to?(:matcher_name=)
           klass.new(matcher, description_override)
         end
+        ruby2_keywords new_name if respond_to?(:ruby2_keywords, true)
       end
 
       # Defines a negated matcher. The returned matcher's `description` and `failure_message`
-      # will be overriden to reflect the phrasing of the new name, and the match logic will
+      # will be overridden to reflect the phrasing of the new name, and the match logic will
       # be based on the original matcher but negated.
       #
       # @example
@@ -53,7 +54,7 @@ module RSpec
       #
       # @param negated_name [Symbol] the name for the negated matcher
       # @param base_name [Symbol] the name of the original matcher that will be negated
-      # @yield [String] optional block that, when given, is used to define the overriden
+      # @yield [String] optional block that, when given, is used to define the overridden
       #   logic. The yielded arg is the original description or failure message. If no
       #   block is provided, a default override is used based on the old and new names.
       # @see RSpec::Matchers
@@ -197,7 +198,7 @@ module RSpec
           end
         end
 
-        # Customizes the failure messsage to use when this matcher is
+        # Customizes the failure message to use when this matcher is
         # asked to positively match. Only use this when the message
         # generated by default doesn't suit your needs.
         #
@@ -216,7 +217,7 @@ module RSpec
           define_user_override(__method__, definition)
         end
 
-        # Customize the failure messsage to use when this matcher is asked
+        # Customize the failure message to use when this matcher is asked
         # to negatively match. Only use this when the message generated by
         # default doesn't suit your needs.
         #
@@ -330,7 +331,7 @@ module RSpec
         # - Defines the named method using a user-provided block
         #   in @user_method_defs, which is included as an ancestor
         #   in the singleton class in which we eval the `define` block.
-        # - Defines an overriden definition for the same method
+        # - Defines an overridden definition for the same method
         #   usign the provided `our_def` block.
         # - Provides a default `our_def` block for the common case
         #   of needing to call the user's definition with `@actual`

data/vendor/bundle/ruby/2.5.0/gems/{rspec-expectations-3.12.0 → rspec-expectations-3.12.2}/lib/rspec/matchers.rb

@@ -704,7 +704,7 @@ module RSpec
 
     # An alternate form of `contain_exactly` that accepts
     # the expected contents as a single array arg rather
-    # that splatted out as individual items.
+    # than splatted out as individual items.
     #
     # @example
     #   expect(results).to contain_exactly(1, 2)

data/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/Changelog.md

@@ -1,5 +1,55 @@
 ### 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.5...3-12-maintenance)
+
+### 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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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/vendor/bundle/ruby/2.5.0/gems/{rspec-mocks-3.12.0 → rspec-mocks-3.12.5}/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