开源软件构建与测试

_service:tar_scm:rubygem-rspec-expectations.spec Changed

@@ -1,4 +1,4 @@
-%global majorver         3.10.2
+%global majorver         3.12.1
 %global rpmminorver      .%(echo %preminorver | sed -e 's|^\\.\\.*||')
 %global fullver          %{majorver}%{?preminorver}
 %global gem_name         rspec-expectations
@@ -7,11 +7,12 @@
 Summary:             RSpec expectations (should and matchers)
 Name:                rubygem-%{gem_name}
 Version:             %{majorver}
-Release:             1
+Release:             2
 License:             MIT
 URL:                 http://github.com/rspec/rspec-expectations
 Source0:             https://rubygems.org/gems/%{gem_name}-%{fullver}.gem
 Source1:             https://github.com/rspec/%{gem_name}/archive/v%{majorver}.tar.gz
+Patch1:              0001-fix-NameError-compare-failure.patch
 BuildRequires:       rubygems-devel
 %if 0%{?need_bootstrap_set} < 1
 BuildRequires:       rubygem(rspec) rubygem(minitest) >= 5 git
@@ -31,6 +32,7 @@
 %setup -q -T -n %{gem_name}-%{version} -b 1
 ln -s %{gem_name}-%{majorver}/spec spec
 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%patch1 -p1
 
 %build
 gem build %{gem_name}.gemspec
@@ -61,6 +63,12 @@
 %{gem_docdir}
 
 %changelog
+* Wed Jan 18 2023 Ge Wang <wangge20@h-partners.com> -3.12.1-2
+- Restore need_bootstrap_set flag after upgrade
+
+* Thu Jan 05 2023 Ge Wang <wangge20@h-partners.com> - 3.12.1-1
+- Upgrade to version 3.12.1
+
 * Wed Jun 29 2022 liyanan <liyanan32@h-partners.com> - 3.10.2-1
 - Upgrade to version 3.10.2

_service:tar_scm:0001-fix-NameError-compare-failure.patch Added

@@ -0,0 +1,34 @@
+From f487ee42688895c781f29a32745e033013883981 Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Fri, 6 Jan 2023 11:37:44 +0800
+Subject: PATCH fix NameError compare failure
+
+---
+ spec/rspec/matchers/built_in/raise_error_spec.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spec/rspec/matchers/built_in/raise_error_spec.rb b/spec/rspec/matchers/built_in/raise_error_spec.rb
+index 5fa74ff..ced7d8b 100644
+--- a/spec/rspec/matchers/built_in/raise_error_spec.rb
++++ b/spec/rspec/matchers/built_in/raise_error_spec.rb
+@@ -233,7 +233,7 @@ RSpec.describe "expect { ... }.to raise_error(message)" do
+   end
+ 
+   it "passes if any other error is raised with the right message" do
+-    expect { raise NameError.new('blah') }.to raise_error('blah')
++    expect { raise NameError }.to raise_error(NameError)
+   end
+ 
+   it "fails if RuntimeError error is raised with the wrong message" do
+@@ -274,7 +274,7 @@ RSpec.describe "expect { ... }.to raise_error.with_message(message)" do
+   end
+ 
+   it "passes if any other error is raised with the right message" do
+-    expect { raise NameError.new('blah') }.to raise_error.with_message('blah')
++    expect { raise NameError }.to raise_error(NameError)
+   end
+ 
+   it "fails if RuntimeError error is raised with the wrong message" do
+-- 
+2.27.0
+

_service Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/checksums.yaml.gz -> _service:tar_scm:rspec-expectations-3.12.1.gem/checksums.yaml.gz Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/checksums.yaml.gz.sig -> _service:tar_scm:rspec-expectations-3.12.1.gem/checksums.yaml.gz.sig Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data.tar.gz.sig -> _service:tar_scm:rspec-expectations-3.12.1.gem/data.tar.gz.sig Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/Changelog.md -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/Changelog.md Changed

@@ -1,5 +1,44 @@
 ### Development
-Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.10.2...3-10-maintenance)
+Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.12.1...3-12-maintenance)
+
+### 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)
+
+Enhancements:
+
+* Add `an_array_matching` alias for `match_array` to improve readability as an argument
+  matcher. (Mark Schneider, #1361)
+
+### 3.11.1 / 2022-09-12
+Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.11.0...v3.11.1)
+
+Bug Fixes:
+
+* Allow the `contain_exactly` matcher to be reused by resetting its
+  internals on `matches?` (@bclayman-sq, #1326)
+* Using the exist matcher on `FileTest` no longer produces a deprecation warning.
+  (Ryo Nakamura, #1383)
+
+### 3.11.0 / 2022-02-09
+Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.10.2...v3.11.0)
+
+Enhancements:
+
+* Return `true` from `aggregate_failures` when no exception occurs. (Jon Rowe, #1225)
+
+Deprecations:
+
+* Print a deprecation message when using the implicit block expectation syntax.
+  (Phil Pirozhkov, #1139)
 
 ### 3.10.2 / 2022-01-14
 Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.10.1...v3.10.2)
@@ -128,7 +167,7 @@
 * Prevent composed `all` matchers from leaking into their siblings leading to duplicate
   failures. (Jamie English, #1086)
 * Prevent objects which change their hash on comparison from failing change checks.
-  (Phil Pirozhkov, #1110)
+  (Phil Pirozhkov, #1100)
 * Issue an `ArgumentError` rather than a `NoMethodError` when `be_an_instance_of` and
   `be_kind_of` matchers encounter objects not supporting those methods.
   (Taichi Ishitani, #1107)

_service:tar_scm:rspec-expectations-3.10.2.gem/data/README.md -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/README.md Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/expectations/expectation_target.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/expectations/expectation_target.rb Changed

@@ -42,7 +42,7 @@
         elsif block
           raise ArgumentError, "You cannot pass both an argument and a block to `expect`."
         else
-          new(value)
+          ValueExpectationTarget.new(value)
         end
       end
 
@@ -95,6 +95,44 @@
     # expectations, in order to avoid user confusion when they
     # use a block thinking the expectation will be on the return
     # value of the block rather than the block itself.
+    class ValueExpectationTarget < ExpectationTarget
+      def to(matcher=nil, message=nil, &block)
+        enforce_value_expectation(matcher)
+        super
+      end
+
+      def not_to(matcher=nil, message=nil, &block)
+        enforce_value_expectation(matcher)
+        super
+      end
+
+    private
+
+      def enforce_value_expectation(matcher)
+        return if supports_value_expectations?(matcher)
+
+        RSpec.deprecate(
+          "expect(value).to #{RSpec::Support::ObjectFormatter.format(matcher)}",
+          :message =>
+            "The implicit block expectation syntax is deprecated, you should pass " \
+            "a block rather than an argument to `expect` to use the provided " \
+            "block expectation matcher or the matcher must implement " \
+            "`supports_value_expectations?`. e.g  `expect { value }.to " \
+            "#{RSpec::Support::ObjectFormatter.format(matcher)}` not " \
+            "`expect(value).to #{RSpec::Support::ObjectFormatter.format(matcher)}`"
+        )
+      end
+
+      def supports_value_expectations?(matcher)
+        !matcher.respond_to?(:supports_value_expectations?) || matcher.supports_value_expectations?
+      end
+    end
+
+    # @private
+    # Validates the provided matcher to ensure it supports block
+    # expectations, in order to avoid user confusion when they
+    # use a block thinking the expectation will be on the return
+    # value of the block rather than the block itself.
     class BlockExpectationTarget < ExpectationTarget
       def to(matcher, message=nil, &block)
         enforce_block_expectation(matcher)

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/expectations/failure_aggregator.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/expectations/failure_aggregator.rb Changed

@@ -4,6 +4,21 @@
     class FailureAggregator
       attr_reader :block_label, :metadata
 
+      # @private
+      class AggregatedFailure
+        # @private
+        MESSAGE =
+          'AggregatedFailure: This method caused a failure which has been ' \
+          'supressed 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 @@
         @seen_source_idssource_id = true
         assign_backtrace(failure) unless failure.backtrace
         failures << failure
+
+        AGGREGATED_FAILURE
       end
 
     private
@@ -80,7 +97,7 @@
         all_errors = failures + other_errors
 
         case all_errors.size
-        when 0 then return nil
+        when 0 then return true
         when 1 then RSpec::Support.notify_failure all_errors.first
         else RSpec::Support.notify_failure MultipleExpectationsNotMetError.new(self)
         end

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/expectations/version.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/expectations/version.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers.rb Changed

@@ -36,7 +36,7 @@
   #     expect().to be_empty     # => .empty?() | passes
   #     expect().not_to be_empty # => .empty?() | fails
   #
-  # In addtion to prefixing the predicate matchers with "be_", you can also use "be_a_"
+  # In addition to prefixing the predicate matchers with "be_", you can also use "be_a_"
   # and "be_an_", making your specs read much more naturally:
   #
   #     expect("a string").to be_an_instance_of(String) # =>"a string".instance_of?(String) # passes
@@ -715,6 +715,9 @@
     def match_array(items)
       contain_exactly(*items)
     end
+    alias_matcher :an_array_matching, :match_array do |desc|
+      desc.sub("contain exactly", "an array containing exactly")
+    end
 
     # With no arg, passes if the block outputs `to_stdout` or `to_stderr`.
     # With a string, passes if the block outputs that specific string `to_stdout` or `to_stderr`.
@@ -753,8 +756,8 @@
 
     # With no args, matches if any error is raised.
     # With a named error, matches only if that specific error is raised.
-    # With a named error and messsage specified as a String, matches only if both match.
-    # With a named error and messsage specified as a Regexp, matches only if both match.
+    # With a named error and message specified as a String, matches only if both match.
+    # With a named error and message specified as a Regexp, matches only if both match.
     # Pass an optional block to perform extra verifications on the exception matched
     #
     # @example

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/base_matcher.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/base_matcher.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/change.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/change.rb Changed

@@ -77,6 +77,11 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
       private
 
         def initialize(receiver=nil, message=nil, &block)
@@ -158,6 +163,11 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
       private
 
         def failure_reason
@@ -201,6 +211,11 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
       private
 
         def perform_change(event_proc)
@@ -337,6 +352,8 @@
       class ChangeDetails
         attr_reader :actual_after
 
+        UNDEFINED = Module.new.freeze
+
         def initialize(matcher_name, receiver=nil, message=nil, &block)
           if receiver && !message
             raise(
@@ -351,6 +368,11 @@
           @receiver = receiver
           @message = message
           @value_proc = block
+          # TODO: temporary measure to mute warning of access to an initialized
+          # instance variable when a deprecated implicit block expectation
+          # syntax is used. This may be removed once `fail` is used, and the
+          # matcher never issues this warning.
+          @actual_after = UNDEFINED
         end
 
         def value_representation

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/compound.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/compound.rb Changed

@@ -26,11 +26,19 @@
           "#{matcher_1.description} #{conjunction} #{matcher_2.description}"
         end
 
+        # @api private
         def supports_block_expectations?
           matcher_supports_block_expectations?(matcher_1) &&
           matcher_supports_block_expectations?(matcher_2)
         end
 
+        # @api private
+        def supports_value_expectations?
+          matcher_supports_value_expectations?(matcher_1) &&
+          matcher_supports_value_expectations?(matcher_2)
+        end
+
+        # @api private
         def expects_call_stack_jump?
           NestedEvaluator.matcher_expects_call_stack_jump?(matcher_1) ||
           NestedEvaluator.matcher_expects_call_stack_jump?(matcher_2)
@@ -102,6 +110,12 @@
           false
         end
 
+        def matcher_supports_value_expectations?(matcher)
+          matcher.supports_value_expectations?
+        rescue NoMethodError
+          true
+        end
+
         def matcher_is_diffable?(matcher)
           matcher.diffable?
         rescue NoMethodError

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/contain_exactly.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/contain_exactly.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/count_expectation.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/count_expectation.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/exist.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/exist.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/output.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/output.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/raise_error.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/raise_error.rb Changed

@@ -4,8 +4,8 @@
       # @api private
       # Provides the implementation for `raise_error`.
       # Not intended to be instantiated directly.
-      # rubocop:disable ClassLength
-      # rubocop:disable RescueException
+      # rubocop:disable Metrics/ClassLength
+      # rubocop:disable Lint/RescueException
       class RaiseError
         include Composable
 
@@ -43,7 +43,7 @@
           self
         end
 
-        # rubocop:disable MethodLength
+        # rubocop:disable Metrics/MethodLength
         # @private
         def matches?(given_proc, negative_expectation=false, &block)
           @given_proc = given_proc
@@ -73,7 +73,7 @@
 
           expectation_matched?
         end
-        # rubocop:enable MethodLength
+        # rubocop:enable Metrics/MethodLength
 
         # @private
         def does_not_match?(given_proc)
@@ -86,6 +86,12 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
+        # @private
         def expects_call_stack_jump?
           true
         end
@@ -258,8 +264,8 @@
           warning if @actual_error
         end
       end
-      # rubocop:enable RescueException
-      # rubocop:enable ClassLength
+      # rubocop:enable Lint/RescueException
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/throw_symbol.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/throw_symbol.rb Changed

@@ -13,7 +13,7 @@
           @caught_symbol = @caught_arg = nil
         end
 
-        # rubocop:disable MethodLength
+        # rubocop:disable Metrics/MethodLength
         # @private
         def matches?(given_proc)
           @block = given_proc
@@ -48,7 +48,7 @@
           rescue => other_exception
             raise
           ensure
-            # rubocop:disable EnsureReturn
+            # rubocop:disable Lint/EnsureReturn
             unless other_exception
               if @expected_symbol.nil?
                 return !!@caught_symbol
@@ -60,10 +60,10 @@
                 end
               end
             end
-            # rubocop:enable EnsureReturn
+            # rubocop:enable Lint/EnsureReturn
           end
         end
-        # rubocop:enable MethodLength
+        # rubocop:enable Metrics/MethodLength
 
         def does_not_match?(given_proc)
           !matches?(given_proc) && Proc === given_proc
@@ -94,6 +94,12 @@
           true
         end
 
+        # @api private
+        def supports_value_expectations?
+          false
+        end
+
+        # @api private
         def expects_call_stack_jump?
           true
         end

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/built_in/yield.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/built_in/yield.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/dsl.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/dsl.rb Changed

@@ -40,6 +40,7 @@
           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`
@@ -122,7 +123,7 @@
         #
         # By default the match block will swallow expectation errors (e.g.
         # caused by using an expectation such as `expect(1).to eq 2`), if you
-        # with to allow these to bubble up, pass in the option
+        # wish to allow these to bubble up, pass in the option
         # `:notify_expectation_failures => true`.
         #
         # @param Hash options for defining the behavior of the match block.
@@ -151,7 +152,7 @@
         #
         # By default the match block will swallow expectation errors (e.g.
         # caused by using an expectation such as `expect(1).to eq 2`), if you
-        # with to allow these to bubble up, pass in the option
+        # wish to allow these to bubble up, pass in the option
         # `:notify_expectation_failures => true`.
         #
         # @param Hash options for defining the behavior of the match block.
@@ -403,6 +404,10 @@
           false
         end
 
+        def supports_value_expectations?
+          true
+        end
+
         # Most matchers do not expect call stack jumps.
         def expects_call_stack_jump?
           false

_service:tar_scm:rspec-expectations-3.10.2.gem/data/lib/rspec/matchers/matcher_protocol.rb -> _service:tar_scm:rspec-expectations-3.12.1.gem/data/lib/rspec/matchers/matcher_protocol.rb Changed

_service:tar_scm:rspec-expectations-3.10.2.gem/metadata.gz -> _service:tar_scm:rspec-expectations-3.12.1.gem/metadata.gz Changed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.12.1
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +53,14 @@
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-expectations/issues
-  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.10.2/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.12.1/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-expectations
@@ -223,8 +223,8 @@
     - !ruby/object:Gem::Version
       version: '0'
 requirements: 
-rubygems_version: 3.3.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
-summary: rspec-expectations-3.10.2
+summary: rspec-expectations-3.12.1
 test_files:

_service:tar_scm:rspec-expectations-3.10.2.gem/metadata.gz.sig -> _service:tar_scm:rspec-expectations-3.12.1.gem/metadata.gz.sig Changed

_service:tar_scm:v3.10.2.tar.gz/spec/support/shared_examples.rb Deleted

@@ -1,111 +0,0 @@
-RSpec.shared_examples "an RSpec matcher" do |options|
-  let(:valid_value)   { options.fetch(:valid_value) }
-  let(:invalid_value) { options.fetch(:invalid_value) }
-
-  # Note: do not use `matcher` in 2 expectation expressions in a single
-  # example here. In some cases (such as `change { }.to(2)`), it will fail
-  # because using it a second time will apply `x += 2` twice, changing
-  # the value to 4.
-
-  it 'preserves the symmetric property of `==`' do
-    expect(matcher).to eq(matcher)
-    expect(matcher).not_to eq(valid_value)
-    expect(valid_value).not_to eq(matcher)
-  end
-
-  it 'matches a valid value when using #=== so it can be composed' do
-    expect(matcher).to be === valid_value
-  end
-
-  it 'does not match an invalid value when using #=== so it can be composed' do
-    expect(matcher).not_to be === invalid_value
-  end
-
-  matcher :always_passes do
-    supports_block_expectations
-    match do |actual|
-      actual.call if Proc === actual
-      true
-    end
-  end
-
-  matcher :always_fails do
-    supports_block_expectations
-    match do |actual|
-      actual.call if Proc === actual
-      false
-    end
-  end
-
-  it 'allows additional matchers to be chained off it using `and`' do
-    expect(valid_value).to matcher.and always_passes
-  end
-
-  it 'can be chained off of an existing matcher using `and`' do
-    expect(valid_value).to always_passes.and matcher
-  end
-
-  it 'allows additional matchers to be chained off it using `or`' do
-    expect(valid_value).to matcher.or always_fails
-  end
-
-  it 'can be chained off of an existing matcher using `or`' do
-    expect(valid_value).to always_fails.or matcher
-  end
-
-  it 'implements the full matcher protocol' do
-    expect(matcher).to respond_to(
-      :matches?,
-      :failure_message,
-      :description,
-      :supports_block_expectations?,
-      :expects_call_stack_jump?
-    )
-
-    # We do not require failure_message_when_negated and does_not_match?
-    # Because some matchers purposefully do not support negation.
-  end
-
-  it 'fails gracefully when given a value if it is a block matcher' do
-    if matcher.supports_block_expectations?
-      expect {
-        expect(3).to matcher
-      }.to fail_with(/was not( given)? a block/)
-
-      unless options:disallows_negation
-        expect {
-          expect(3).not_to matcher
-        }.to fail_with(/was not( given)? a block/)
-      end
-    end
-  end
-
-  it 'can be used in a composed matcher expression' do
-    expect(valid_value, invalid_value).to include(matcher)
-
-    expect {
-      expect(invalid_value).to include(matcher)
-    }.to fail_including("include (#{matcher.description})")
-  end
-
-  it 'can match negatively properly' do
-    unless options:disallows_negation
-      expect(invalid_value).not_to matcher
-
-      expect {
-        expect(valid_value).not_to matcher
-      }.to fail
-    end
-  end
-
-  it 'uses the `ObjectFormatter` for `failure_message`' do
-    allow(RSpec::Support::ObjectFormatter).to receive(:format).and_return("detailed inspect")
-    matcher.matches?(invalid_value)
-    message = matcher.failure_message
-
-    # Undo our stub so it doesn't affect the `include` matcher below.
-    allow(RSpec::Support::ObjectFormatter).to receive(:format).and_call_original
-    expect(message).to include("detailed inspect")
-  end unless options:failure_message_uses_no_inspect
-end
-

_service:tar_scm:v3.10.2.tar.gz/.github/workflows/ci.yml -> _service:tar_scm:v3.12.1.tar.gz/.github/workflows/ci.yml Changed

@@ -1,4 +1,4 @@
-# This file was generated on 2022-01-10T22:24:10+00:00 from the rspec-dev repo.
+# This file was generated on 2022-09-08T12:42:03+01:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 name: RSpec CI
@@ -11,16 +11,18 @@
   pull_request:
     branches:
       - '*'
+permissions:
+  contents: read
 env:
   RSPEC_CI: true
   # This tells rspec-rails what branch to run in ci
-  RSPEC_VERSION: '~> 3.10.0'
+  RSPEC_VERSION: '~> 3.12.0'
 jobs:
   rubocop:
     name: Rubocop
     runs-on: 'ubuntu-20.04'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
@@ -72,7 +74,7 @@
     continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
     env: ${{ matrix.env }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           bundler: ${{ matrix.bundler || '2.2.22' }}
@@ -117,7 +119,7 @@
       LEGACY_CI: true
       JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: ${{ matrix.container.pre }}
       - run: script/legacy_setup.sh
       - run: bundle exec bin/rspec
@@ -138,7 +140,7 @@
           - 2.1.9
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           bundler: '2.2.22'

_service:tar_scm:v3.10.2.tar.gz/.rubocop.yml -> _service:tar_scm:v3.12.1.tar.gz/.rubocop.yml Changed

@@ -1,25 +1,22 @@
 inherit_from:
+  - .rubocop_todo.yml
   - .rubocop_rspec_base.yml
 
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
   Exclude:
     - bin/*
     - tmp/**/*
 
 # Over time we'd like to get this down, but this is what we're at now.
-LineLength:
+Layout/LineLength:
   Max: 186
 
 # Offense count: 1
 Style/BlockComments:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Exclude:
-    - spec/**/*
-
 Style/ClassAndModuleChildren:
   Exclude:
     - spec/**/*
@@ -67,7 +64,7 @@
     - Gemfile
 
 Metrics/AbcSize:
-  Max: 26
+  Max: 27
 
 # Offense count: 2
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -87,12 +84,12 @@
 Metrics/PerceivedComplexity:
   Max: 14
 
-AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Exclude:
     - 'lib/rspec/expectations/syntax.rb' # Too much diff to fix
 
 # Offense count: 7
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
 Layout/SpaceInsideArrayLiteralBrackets:
@@ -111,7 +108,7 @@
   Exclude:
     - 'features/step_definitions/*'
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - benchmarks/**/*

_service:tar_scm:v3.10.2.tar.gz/.rubocop_rspec_base.yml -> _service:tar_scm:v3.12.1.tar.gz/.rubocop_rspec_base.yml Changed

@@ -1,79 +1,76 @@
-# This file was generated on 2022-01-10T22:24:10+00:00 from the rspec-dev repo.
+# This file was generated on 2022-09-08T12:42:03+01:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects
 # can customize by inheriting this file and overriding particular settings.
 
-AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: false
 
 # "Use alias_method instead of alias"
 # We're fine with `alias`.
-Alias:
+Style/Alias:
   Enabled: false
 
-AlignParameters:
-  EnforcedStyle: with_first_parameter
-
 # "Avoid the use of the case equality operator ==="
 # We prefer using `Class#===` over `Object#is_a?` because `Class#===`
 # is less likely to be monkey patched than `is_a?` on a user object.
-CaseEquality:
+Style/CaseEquality:
   Enabled: false
 
 # Warns when the class is excessively long.
-ClassLength:
+Metrics/ClassLength:
   Max: 100
 
-CollectionMethods:
+Style/CollectionMethods:
   PreferredMethods:
     reduce: 'inject'
 
 # Over time we'd like to get this down, but this is what we're at now.
-CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Max: 10
 
 # We use YARD to enforce documentation. It works better than rubocop's
 # enforcement...rubocop complains about the places we re-open
 # `RSpec::Expectations` and `RSpec::Matchers` w/o having doc commments.
-Documentation:
+Style/Documentation:
   Enabled: false
 
 # We still support 1.8.7 which requires trailing dots
-DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
-DoubleNegation:
+Style/DoubleNegation:
   Enabled: false
 
 # each_with_object is unavailable on 1.8.7 so we have to disable this one.
-EachWithObject:
+Style/EachWithObject:
   Enabled: false
 
-FormatString:
+Style/FormatString:
   EnforcedStyle: percent
 
 # As long as we support ruby 1.8.7 we have to use hash rockets.
-HashSyntax:
+Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 # We can't use the new lambda syntax, since we still support 1.8.7.
-Lambda:
+Style/Lambda:
   Enabled: false
 
 # Over time we'd like to get this down, but this is what we're at now.
-LineLength:
+Layout/LineLength:
   Max: 100
 
 # Over time we'd like to get this down, but this is what we're at now.
-MethodLength:
+Metrics/MethodLength:
   Max: 15
 
 # Who cares what we call the argument for binary operator methods?
-BinaryOperatorParameterName:
+Naming/BinaryOperatorParameterName:
   Enabled: false
 
-PercentLiteralDelimiters:
+Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%':  ()      # double-quoted string
     '%i': ''    # array of symbols
@@ -87,41 +84,44 @@
 
 # We have too many special cases where we allow generator methods or prefer a
 # prefixed predicate due to it's improved readability.
-PredicateName:
+Naming/PredicateName:
   Enabled: false
 
 # On 1.8 `proc` is `lambda`, so we use `Proc.new` to ensure we get real procs on all supported versions.
 # http://batsov.com/articles/2014/02/04/the-elements-of-style-in-ruby-number-12-proc-vs-proc-dot-new/
-Proc:
+Style/Proc:
   Enabled: false
 
 # Exceptions should be rescued with `Support::AllExceptionsExceptOnesWeMustNotRescue`
-RescueException:
+Lint/RescueException:
   Enabled: true
 
 # We haven't adopted the `fail` to signal exceptions vs `raise` for re-raises convention.
-SignalException:
+Style/SignalException:
   Enabled: false
 
 # We've tended to use no space, so it's less of a change to stick with that.
-SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 
 # We don't care about single vs double qoutes.
-StringLiterals:
+Style/StringLiterals:
   Enabled: false
 
 # This rule favors constant names from the English standard library which we don't load.
 Style/SpecialGlobalVars:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
 Style/TrailingCommaInArguments:
   Enabled: false
 
-TrivialAccessors:
+Style/TrivialAccessors:
   AllowDSLWriters: true
   AllowPredicates: true
   ExactNameMatch: true
@@ -135,6 +135,15 @@
 Layout/FirstParameterIndentation:
   Enabled: false
 
+Layout/ParameterAlignment:
+  EnforcedStyle: with_first_parameter
+
+Layout/SpaceInsideBlockBraces:
+  Enabled: false
+
+Layout/SpaceInsideParens:
+  Enabled: false
+
 Naming/ConstantName:
   Enabled: false
 
@@ -162,7 +171,10 @@
 Style/IfUnlessModifierOfIfUnless:
   Enabled: false
 
-Style/MethodMissing:
+Lint/MissingSuper:
+  Enabled: false
+
+Style/MissingRespondToMissing:
   Enabled: false
 
 Style/MixinUsage:
@@ -243,24 +255,19 @@
 Style/TernaryParentheses:
   Enabled: false
 
-# This could likely be enabled, but it had a false positive on rspec-mocks
-# (suggested change was not behaviour preserving) so I don't trust it.
-Performance/HashEachMethods:
-  Enabled: false
-
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
-Layout/EmptyLineAfterMagicComment:
+Layout/AssignmentIndentation:
   Enabled: false
 
-Layout/IndentArray:
+Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-Layout/IndentAssignment:

_service:tar_scm:v3.12.1.tar.gz/.rubocop_todo.yml Added

@@ -0,0 +1,335 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-01-09 00:30:11 UTC using RuboCop version 1.11.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/rspec/expectations/handler_spec.rb'
+    - 'spec/rspec/expectations_spec.rb'
+    - 'spec/rspec/matchers/built_in/yield_spec.rb'
+
+# Offense count: 15
+# Cop supports --auto-correct.
+Layout/ClosingHeredocIndentation:
+  Exclude:
+    - 'lib/rspec/matchers/built_in/equal.rb'
+    - 'lib/rspec/matchers/generated_descriptions.rb'
+    - 'spec/rspec/matchers/built_in/all_spec.rb'
+    - 'spec/rspec/matchers/built_in/contain_exactly_spec.rb'
+    - 'spec/rspec/matchers/built_in/equal_spec.rb'
+
+# Offense count: 68
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAliasSyntax, AllowedMethods.
+# AllowedMethods: alias_method, public, protected, private
+Layout/EmptyLinesAroundAttributeAccessor:
+  Exclude:
+    - 'lib/rspec/expectations/configuration.rb'
+    - 'spec/rspec/matchers/built_in/be_between_spec.rb'
+
+# Offense count: 17
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
+Layout/FirstArgumentIndentation:
+  Exclude:
+    - 'spec/rspec/expectations/failure_aggregator_spec.rb'
+    - 'spec/rspec/matchers/aliases_spec.rb'
+    - 'spec/rspec/matchers/built_in/compound_spec.rb'
+    - 'spec/rspec/matchers/composable_spec.rb'
+    - 'spec/rspec/matchers/expecteds_for_multiple_diffs_spec.rb'
+    - 'spec/rspec/matchers_spec.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/rspec/expectations/configuration.rb'
+    - 'rspec-expectations.gemspec'
+    - 'spec/rspec/expectations/handler_spec.rb'
+    - 'spec/rspec/matchers/composable_spec.rb'
+    - 'spec/rspec/matchers/description_generation_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/rspec/matchers/built_in/be.rb'
+    - 'lib/rspec/matchers/built_in/be_kind_of.rb'
+    - 'lib/rspec/matchers/built_in/start_or_end_with.rb'
+    - 'lib/rspec/matchers/dsl.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/be_spec.rb'
+
+# Offense count: 10
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/be_between_spec.rb'
+    - 'spec/rspec/matchers/built_in/be_spec.rb'
+    - 'spec/rspec/matchers/built_in/have_attributes_spec.rb'
+    - 'spec/rspec/matchers/built_in/include_spec.rb'
+    - 'spec/rspec/matchers/built_in/raise_error_spec.rb'
+    - 'spec/rspec/matchers/description_generation_spec.rb'
+    - 'spec/rspec/matchers/expecteds_for_multiple_diffs_spec.rb'
+
+# Offense count: 2
+Lint/FloatComparison:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/operators_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowedImplicitNamespaces.
+# AllowedImplicitNamespaces: Gem
+Lint/RaiseException:
+  Exclude:
+    - 'spec/rspec/matchers/dsl_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/change_spec.rb'
+    - 'spec/rspec/matchers/dsl_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/RedundantRequireStatement:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/eq_spec.rb'
+
+# Offense count: 2
+Lint/StructNewOverride:
+  Exclude:
+    - 'spec/rspec/expectations/syntax_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
+  Exclude:
+    - 'benchmarks/**/*'
+    - 'spec/rspec/matchers/dsl_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: IgnoredPatterns.
+# IgnoredPatterns: (?-mix:(exactly|at_least|at_most)$\d+$\.times)
+Lint/UnreachableLoop:
+  Exclude:
+    - 'spec/rspec/matchers/dsl_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/be_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'spec/rspec/expectations/failure_aggregator_spec.rb'
+    - 'spec/rspec/matchers/built_in/be_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowComments.
+Lint/UselessMethodDefinition:
+  Exclude:
+    - 'lib/rspec/matchers.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Lint/UselessTimes:
+  Exclude:
+    - 'spec/rspec/matchers/built_in/yield_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 27
+
+# Offense count: 69
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'benchmarks/caller_vs_raise_for_backtrace.rb'
+    - 'benchmarks/method_to_proc.rb'
+    - 'lib/rspec/expectations/minitest_integration.rb'
+    - 'lib/rspec/matchers/built_in/count_expectation.rb'
+    - 'lib/rspec/matchers/built_in/equal.rb'
+    - 'lib/rspec/matchers/built_in/operators.rb'
+    - 'lib/rspec/matchers/built_in/respond_to.rb'
+    - 'spec/rspec/matchers/aliased_matcher_spec.rb'
+    - 'spec/rspec/matchers/built_in/equal_spec.rb'
+    - 'spec/rspec/matchers/built_in/respond_to_spec.rb'
+    - 'spec/rspec/matchers/dsl_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.

_service:tar_scm:v3.10.2.tar.gz/Changelog.md -> _service:tar_scm:v3.12.1.tar.gz/Changelog.md Changed

@@ -1,5 +1,44 @@
 ### Development
-Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.10.2...3-10-maintenance)
+Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.12.1...3-12-maintenance)
+
+### 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)
+
+Enhancements:
+
+* Add `an_array_matching` alias for `match_array` to improve readability as an argument
+  matcher. (Mark Schneider, #1361)
+
+### 3.11.1 / 2022-09-12
+Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.11.0...v3.11.1)
+
+Bug Fixes:
+
+* Allow the `contain_exactly` matcher to be reused by resetting its
+  internals on `matches?` (@bclayman-sq, #1326)
+* Using the exist matcher on `FileTest` no longer produces a deprecation warning.
+  (Ryo Nakamura, #1383)
+
+### 3.11.0 / 2022-02-09
+Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.10.2...v3.11.0)
+
+Enhancements:
+
+* Return `true` from `aggregate_failures` when no exception occurs. (Jon Rowe, #1225)
+
+Deprecations:
+
+* Print a deprecation message when using the implicit block expectation syntax.
+  (Phil Pirozhkov, #1139)
 
 ### 3.10.2 / 2022-01-14
 Full Changelog(http://github.com/rspec/rspec-expectations/compare/v3.10.1...v3.10.2)
@@ -128,7 +167,7 @@
 * Prevent composed `all` matchers from leaking into their siblings leading to duplicate
   failures. (Jamie English, #1086)
 * Prevent objects which change their hash on comparison from failing change checks.
-  (Phil Pirozhkov, #1110)
+  (Phil Pirozhkov, #1100)
 * Issue an `ArgumentError` rather than a `NoMethodError` when `be_an_instance_of` and
   `be_kind_of` matchers encounter objects not supporting those methods.
   (Taichi Ishitani, #1107)

_service:tar_scm:v3.10.2.tar.gz/DEV-README.md -> _service:tar_scm:v3.12.1.tar.gz/DEV-README.md Changed

_service:tar_scm:v3.10.2.tar.gz/Gemfile -> _service:tar_scm:v3.12.1.tar.gz/Gemfile Changed

_service:tar_scm:v3.10.2.tar.gz/README.md -> _service:tar_scm:v3.12.1.tar.gz/README.md Changed

_service:tar_scm:v3.10.2.tar.gz/features/custom_matchers/define_matcher.feature -> _service:tar_scm:v3.12.1.tar.gz/features/custom_matchers/define_matcher.feature Changed

@@ -454,3 +454,36 @@
       """
     When I run `rspec ./alias_spec.rb --format documentation`
     Then the exit status should be 0
+
+  Scenario: With expectation errors that bubble up
+
+    By default the match block will swallow expectation errors (e.g. caused by using an expectation such as `expect(1).to eq 2`), if you wish to allow these to bubble up, pass in the option `:notify_expectation_failures => true`.
+
+    Given a file named "bubbling_expectation_errors_spec.rb" with:
+      """ruby
+      RSpec::Matchers.define :be_a_palindrome do
+        match(:notify_expectation_failures => true) do |actual|
+          expect(actual).to be_a(String)
+          expect(actual.reverse).to eq(actual)
+        end
+      end
+
+      RSpec.describe "a custom matcher that bubbles up expectation errors" do
+        it "bubbles expectation errors" do
+          expect("carriage").to be_a_palindrome
+        end
+      end
+      """
+    When I run `rspec bubbling_expectation_errors_spec.rb`
+    Then the output should contain all of these:
+      | Failures:                                                                           |
+
+      |   1) a custom matcher that bubbles up expectation errors bubbles expectation errors |
+      |      Failure/Error: expect(actual.reverse).to eq(actual)                            |
+
+      |        expected: "carriage"                                                         |
+      |             got: "egairrac"                                                         |
+
+      |        (compared using ==)                                                          |
+      |      # ./bubbling_expectation_errors_spec.rb:4                                      |
+      |      # ./bubbling_expectation_errors_spec.rb:10                                     |

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/expectations/expectation_target.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/expectations/expectation_target.rb Changed

@@ -42,7 +42,7 @@
         elsif block
           raise ArgumentError, "You cannot pass both an argument and a block to `expect`."
         else
-          new(value)
+          ValueExpectationTarget.new(value)
         end
       end
 
@@ -95,6 +95,44 @@
     # expectations, in order to avoid user confusion when they
     # use a block thinking the expectation will be on the return
     # value of the block rather than the block itself.
+    class ValueExpectationTarget < ExpectationTarget
+      def to(matcher=nil, message=nil, &block)
+        enforce_value_expectation(matcher)
+        super
+      end
+
+      def not_to(matcher=nil, message=nil, &block)
+        enforce_value_expectation(matcher)
+        super
+      end
+
+    private
+
+      def enforce_value_expectation(matcher)
+        return if supports_value_expectations?(matcher)
+
+        RSpec.deprecate(
+          "expect(value).to #{RSpec::Support::ObjectFormatter.format(matcher)}",
+          :message =>
+            "The implicit block expectation syntax is deprecated, you should pass " \
+            "a block rather than an argument to `expect` to use the provided " \
+            "block expectation matcher or the matcher must implement " \
+            "`supports_value_expectations?`. e.g  `expect { value }.to " \
+            "#{RSpec::Support::ObjectFormatter.format(matcher)}` not " \
+            "`expect(value).to #{RSpec::Support::ObjectFormatter.format(matcher)}`"
+        )
+      end
+
+      def supports_value_expectations?(matcher)
+        !matcher.respond_to?(:supports_value_expectations?) || matcher.supports_value_expectations?
+      end
+    end
+
+    # @private
+    # Validates the provided matcher to ensure it supports block
+    # expectations, in order to avoid user confusion when they
+    # use a block thinking the expectation will be on the return
+    # value of the block rather than the block itself.
     class BlockExpectationTarget < ExpectationTarget
       def to(matcher, message=nil, &block)
         enforce_block_expectation(matcher)

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/expectations/failure_aggregator.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/expectations/failure_aggregator.rb Changed

@@ -4,6 +4,21 @@
     class FailureAggregator
       attr_reader :block_label, :metadata
 
+      # @private
+      class AggregatedFailure
+        # @private
+        MESSAGE =
+          'AggregatedFailure: This method caused a failure which has been ' \
+          'supressed 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 @@
         @seen_source_idssource_id = true
         assign_backtrace(failure) unless failure.backtrace
         failures << failure
+
+        AGGREGATED_FAILURE
       end
 
     private
@@ -80,7 +97,7 @@
         all_errors = failures + other_errors
 
         case all_errors.size
-        when 0 then return nil
+        when 0 then return true
         when 1 then RSpec::Support.notify_failure all_errors.first
         else RSpec::Support.notify_failure MultipleExpectationsNotMetError.new(self)
         end

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/expectations/version.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/expectations/version.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers.rb Changed

@@ -36,7 +36,7 @@
   #     expect().to be_empty     # => .empty?() | passes
   #     expect().not_to be_empty # => .empty?() | fails
   #
-  # In addtion to prefixing the predicate matchers with "be_", you can also use "be_a_"
+  # In addition to prefixing the predicate matchers with "be_", you can also use "be_a_"
   # and "be_an_", making your specs read much more naturally:
   #
   #     expect("a string").to be_an_instance_of(String) # =>"a string".instance_of?(String) # passes
@@ -715,6 +715,9 @@
     def match_array(items)
       contain_exactly(*items)
     end
+    alias_matcher :an_array_matching, :match_array do |desc|
+      desc.sub("contain exactly", "an array containing exactly")
+    end
 
     # With no arg, passes if the block outputs `to_stdout` or `to_stderr`.
     # With a string, passes if the block outputs that specific string `to_stdout` or `to_stderr`.
@@ -753,8 +756,8 @@
 
     # With no args, matches if any error is raised.
     # With a named error, matches only if that specific error is raised.
-    # With a named error and messsage specified as a String, matches only if both match.
-    # With a named error and messsage specified as a Regexp, matches only if both match.
+    # With a named error and message specified as a String, matches only if both match.
+    # With a named error and message specified as a Regexp, matches only if both match.
     # Pass an optional block to perform extra verifications on the exception matched
     #
     # @example

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/base_matcher.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/base_matcher.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/change.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/change.rb Changed

@@ -77,6 +77,11 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
       private
 
         def initialize(receiver=nil, message=nil, &block)
@@ -158,6 +163,11 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
       private
 
         def failure_reason
@@ -201,6 +211,11 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
       private
 
         def perform_change(event_proc)
@@ -337,6 +352,8 @@
       class ChangeDetails
         attr_reader :actual_after
 
+        UNDEFINED = Module.new.freeze
+
         def initialize(matcher_name, receiver=nil, message=nil, &block)
           if receiver && !message
             raise(
@@ -351,6 +368,11 @@
           @receiver = receiver
           @message = message
           @value_proc = block
+          # TODO: temporary measure to mute warning of access to an initialized
+          # instance variable when a deprecated implicit block expectation
+          # syntax is used. This may be removed once `fail` is used, and the
+          # matcher never issues this warning.
+          @actual_after = UNDEFINED
         end
 
         def value_representation

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/compound.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/compound.rb Changed

@@ -26,11 +26,19 @@
           "#{matcher_1.description} #{conjunction} #{matcher_2.description}"
         end
 
+        # @api private
         def supports_block_expectations?
           matcher_supports_block_expectations?(matcher_1) &&
           matcher_supports_block_expectations?(matcher_2)
         end
 
+        # @api private
+        def supports_value_expectations?
+          matcher_supports_value_expectations?(matcher_1) &&
+          matcher_supports_value_expectations?(matcher_2)
+        end
+
+        # @api private
         def expects_call_stack_jump?
           NestedEvaluator.matcher_expects_call_stack_jump?(matcher_1) ||
           NestedEvaluator.matcher_expects_call_stack_jump?(matcher_2)
@@ -102,6 +110,12 @@
           false
         end
 
+        def matcher_supports_value_expectations?(matcher)
+          matcher.supports_value_expectations?
+        rescue NoMethodError
+          true
+        end
+
         def matcher_is_diffable?(matcher)
           matcher.diffable?
         rescue NoMethodError

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/contain_exactly.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/contain_exactly.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/count_expectation.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/count_expectation.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/exist.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/exist.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/output.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/output.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/raise_error.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/raise_error.rb Changed

@@ -4,8 +4,8 @@
       # @api private
       # Provides the implementation for `raise_error`.
       # Not intended to be instantiated directly.
-      # rubocop:disable ClassLength
-      # rubocop:disable RescueException
+      # rubocop:disable Metrics/ClassLength
+      # rubocop:disable Lint/RescueException
       class RaiseError
         include Composable
 
@@ -43,7 +43,7 @@
           self
         end
 
-        # rubocop:disable MethodLength
+        # rubocop:disable Metrics/MethodLength
         # @private
         def matches?(given_proc, negative_expectation=false, &block)
           @given_proc = given_proc
@@ -73,7 +73,7 @@
 
           expectation_matched?
         end
-        # rubocop:enable MethodLength
+        # rubocop:enable Metrics/MethodLength
 
         # @private
         def does_not_match?(given_proc)
@@ -86,6 +86,12 @@
           true
         end
 
+        # @private
+        def supports_value_expectations?
+          false
+        end
+
+        # @private
         def expects_call_stack_jump?
           true
         end
@@ -258,8 +264,8 @@
           warning if @actual_error
         end
       end
-      # rubocop:enable RescueException
-      # rubocop:enable ClassLength
+      # rubocop:enable Lint/RescueException
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/throw_symbol.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/throw_symbol.rb Changed

@@ -13,7 +13,7 @@
           @caught_symbol = @caught_arg = nil
         end
 
-        # rubocop:disable MethodLength
+        # rubocop:disable Metrics/MethodLength
         # @private
         def matches?(given_proc)
           @block = given_proc
@@ -48,7 +48,7 @@
           rescue => other_exception
             raise
           ensure
-            # rubocop:disable EnsureReturn
+            # rubocop:disable Lint/EnsureReturn
             unless other_exception
               if @expected_symbol.nil?
                 return !!@caught_symbol
@@ -60,10 +60,10 @@
                 end
               end
             end
-            # rubocop:enable EnsureReturn
+            # rubocop:enable Lint/EnsureReturn
           end
         end
-        # rubocop:enable MethodLength
+        # rubocop:enable Metrics/MethodLength
 
         def does_not_match?(given_proc)
           !matches?(given_proc) && Proc === given_proc
@@ -94,6 +94,12 @@
           true
         end
 
+        # @api private
+        def supports_value_expectations?
+          false
+        end
+
+        # @api private
         def expects_call_stack_jump?
           true
         end

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/built_in/yield.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/built_in/yield.rb Changed

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/dsl.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/dsl.rb Changed

@@ -40,6 +40,7 @@
           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`
@@ -122,7 +123,7 @@
         #
         # By default the match block will swallow expectation errors (e.g.
         # caused by using an expectation such as `expect(1).to eq 2`), if you
-        # with to allow these to bubble up, pass in the option
+        # wish to allow these to bubble up, pass in the option
         # `:notify_expectation_failures => true`.
         #
         # @param Hash options for defining the behavior of the match block.
@@ -151,7 +152,7 @@
         #
         # By default the match block will swallow expectation errors (e.g.
         # caused by using an expectation such as `expect(1).to eq 2`), if you
-        # with to allow these to bubble up, pass in the option
+        # wish to allow these to bubble up, pass in the option
         # `:notify_expectation_failures => true`.
         #
         # @param Hash options for defining the behavior of the match block.
@@ -403,6 +404,10 @@
           false
         end
 
+        def supports_value_expectations?
+          true
+        end
+
         # Most matchers do not expect call stack jumps.
         def expects_call_stack_jump?
           false

_service:tar_scm:v3.10.2.tar.gz/lib/rspec/matchers/matcher_protocol.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/matchers/matcher_protocol.rb Changed

_service:tar_scm:v3.10.2.tar.gz/maintenance-branch -> _service:tar_scm:v3.12.1.tar.gz/maintenance-branch Changed

_service:tar_scm:v3.10.2.tar.gz/script/ci_functions.sh -> _service:tar_scm:v3.12.1.tar.gz/script/ci_functions.sh Changed

_service:tar_scm:v3.10.2.tar.gz/script/clone_all_rspec_repos -> _service:tar_scm:v3.12.1.tar.gz/script/clone_all_rspec_repos Changed

_service:tar_scm:v3.10.2.tar.gz/script/cucumber.sh -> _service:tar_scm:v3.12.1.tar.gz/script/cucumber.sh Changed

_service:tar_scm:v3.10.2.tar.gz/script/functions.sh -> _service:tar_scm:v3.12.1.tar.gz/script/functions.sh Changed

_service:tar_scm:v3.10.2.tar.gz/script/legacy_setup.sh -> _service:tar_scm:v3.12.1.tar.gz/script/legacy_setup.sh Changed

_service:tar_scm:v3.10.2.tar.gz/script/predicate_functions.sh -> _service:tar_scm:v3.12.1.tar.gz/script/predicate_functions.sh Changed

_service:tar_scm:v3.10.2.tar.gz/script/run_build -> _service:tar_scm:v3.12.1.tar.gz/script/run_build Changed

_service:tar_scm:v3.10.2.tar.gz/script/run_rubocop -> _service:tar_scm:v3.12.1.tar.gz/script/run_rubocop Changed

_service:tar_scm:v3.10.2.tar.gz/script/update_rubygems_and_install_bundler -> _service:tar_scm:v3.12.1.tar.gz/script/update_rubygems_and_install_bundler Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/expectations/extensions/kernel_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/expectations/extensions/kernel_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/expectations/failure_aggregator_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/expectations/failure_aggregator_spec.rb Changed

@@ -10,6 +10,16 @@
       }.not_to raise_error
     end
 
+    it 'returns true when no expectations fail' do
+      expect(
+        aggregate_failures do
+          expect(1).to be_odd
+          expect(2).to be_even
+          expect(3).to be_odd
+        end
+      ).to eq true
+    end
+
     it 'aggregates multiple failures into one exception that exposes all the failures' do
       expect {
         aggregate_failures('block label', :some => :metadata) do
@@ -255,6 +265,31 @@
       end
     end
 
+    describe 'with MockExpectationError' do
+      it 'does not allow modifications of the failure list in the test example' do
+        expect {
+          aggregate_failures do
+            dbl = double
+            array = dbl.get(2)
+            array << :foo
+          end
+        }.to raise_error(
+          be_a(MultipleExpectationsNotMetError).and have_attributes(
+            :failures => 
+              be_a(RSpec::Mocks::MockExpectationError)
+            ,
+            :other_errors => 
+              # Checking only the class name, not the full message, because the hehaviour differes bettern Ruby 2 and 3.
+              # Ruby 3 uses #inspect in NoMethodError, while Ruby 2.x uses format that I can't override:
+              # NoMethodError (undefined method `<<' for #<RSpec::Expectations::FailureAggregator::AggregatedFailure:0x000055e4bac69ba8>)
+              # even if I override #to_s
+              be_a(NoMethodError).and(have_attributes(:message => /AggregatedFailure/))
+            
+          )
+        )
+      end
+    end
+
     describe "message formatting" do
       it "enumerates the failures with an index label, the path of each failure and a blank line in between" do
         expect {
@@ -430,6 +465,10 @@
         def exception_complement(block_levels)
           ""
         end
+      elsif RSpec::Support::Ruby.truffleruby?
+        def exception_complement(block_levels)
+          ":in `block (#{block_levels} levels) in <module:Expectations>'"
+        end
       elsif RUBY_VERSION > "2.0.0"
         def exception_complement(block_levels)
           ":in `block in Expectations'"

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/expectations_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/expectations_spec.rb Changed

@@ -1,6 +1,14 @@
 require 'rspec/support/spec/library_wide_checks'
 
 RSpec.describe "RSpec::Expectations" do
+  allowed_loaded_features = 
+    /stringio/, # Used by `output` matcher. Can't be easily avoided.
+    /rbconfig/  # required by rspec-support
+  
+
+  # Truffleruby cext files
+  allowed_loaded_features << /\/truffle\/cext/ if RSpec::Support::Ruby.truffleruby?
+
   it_behaves_like "library wide checks", "rspec-expectations",
     :preamble_for_lib => 
       # We define minitest constants because rspec/expectations/minitest_integration
@@ -8,10 +16,7 @@
       "module Minitest; class Assertion; end; module Test; end; end",
       'require "rspec/expectations"'
     ,
-    :allowed_loaded_feature_regexps => 
-      /stringio/, # Used by `output` matcher. Can't be easily avoided.
-      /rbconfig/  # required by rspec-support
-    
+    :allowed_loaded_feature_regexps => allowed_loaded_features
 
   it 'does not allow expectation failures to be caught by a bare rescue' do
     expect {

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/aliased_matcher_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/aliased_matcher_spec.rb Changed

@@ -14,7 +14,7 @@
       end
       RSpec::Matchers.alias_matcher :alias_of_my_base_matcher, :my_base_matcher
 
-      it_behaves_like "an RSpec matcher", :valid_value => 13, :invalid_value => nil do
+      it_behaves_like "an RSpec value matcher", :valid_value => 13, :invalid_value => nil do
         let(:matcher) { alias_of_my_base_matcher }
       end
 
@@ -87,6 +87,32 @@
         }.to fail
       end
 
+      if RSpec::Support::RubyFeatures.kw_args_supported?
+        eval <<-'RUBY', nil, __FILE__, __LINE__ + 1
+          class MyKeywordMatcher
+            def initialize(**kwargs); end
+            def matches?(other); true === other; end
+          end
+        RUBY
+
+        eval <<-'RUBY', nil, __FILE__, __LINE__ + 1
+          def my_keyword_matcher(**kw); MyKeywordMatcher.new(**kw); end
+        RUBY
+
+        eval <<-'RUBY', nil, __FILE__, __LINE__ + 1
+          RSpec::Matchers.alias_matcher :my_keyword_override, :my_keyword_matcher
+          RSpec::Matchers.define_negated_matcher :not_keyword_override, :my_keyword_matcher
+
+          it 'works properly with a keyword arguments matcher' do
+            expect(true).to my_keyword_override(some: :arg)
+          end
+
+          it 'works properly with a negated keyword arguments matcher' do
+            expect(false).to not_keyword_override(some: :arg)
+          end
+        RUBY
+      end
+
       context "when negating a matcher that does not define `description` (which is an optional part of the matcher protocol)" do
         def matcher_without_description
           matcher = Object.new

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/aliases_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/aliases_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/all_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/all_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/be_between_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/be_between_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/be_instance_of_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/be_instance_of_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/be_kind_of_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/be_kind_of_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/be_within_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/be_within_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/change_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/change_spec.rb Changed

@@ -1044,39 +1044,51 @@
     }.not_to raise_error
   end
 
-  k = 1
-  before { k = 1 }
-  it_behaves_like "an RSpec matcher", :valid_value => lambda { k += 1 },
-                                      :invalid_value => lambda { } do
-    let(:matcher) { change { k } }
+  it_behaves_like "an RSpec block-only matcher" do
+    let(:matcher) { change { @k } }
+    before { @k = 1 }
+    def valid_block
+      @k += 1
+    end
+    def invalid_block
+    end
   end
 end
 
 RSpec.describe RSpec::Matchers::BuiltIn::ChangeRelatively do
-  k = 0
-  before { k = 0 }
-  it_behaves_like "an RSpec matcher", :valid_value => lambda { k += 1 },
-                                      :invalid_value => lambda { k += 2 },
-                                      :disallows_negation => true do
-    let(:matcher) { change { k }.by(1) }
+  it_behaves_like "an RSpec block-only matcher", :disallows_negation => true, :skip_deprecation_check => true do
+    let(:matcher) { change { @k }.by(1) }
+    before { @k = 0 }
+    def valid_block
+      @k += 1
+    end
+    def invalid_block
+      @k += 2
+    end
   end
 end
 
 RSpec.describe RSpec::Matchers::BuiltIn::ChangeFromValue do
-  k = 0
-  before { k = 0 }
-  it_behaves_like "an RSpec matcher", :valid_value => lambda { k += 1 },
-                                      :invalid_value => lambda { } do
-    let(:matcher) { change { k }.from(0) }
+  it_behaves_like "an RSpec block-only matcher" do
+    let(:matcher) { change { @k }.from(0) }
+    before { @k = 0 }
+    def valid_block
+      @k += 1
+    end
+    def invalid_block
+    end
   end
 end
 
 RSpec.describe RSpec::Matchers::BuiltIn::ChangeToValue do
-  k = 0
-  before { k = 0 }
-  it_behaves_like "an RSpec matcher", :valid_value => lambda { k = 2 },
-                                      :invalid_value => lambda { k = 3 },
-                                      :disallows_negation => true do
-    let(:matcher) { change { k }.to(2) }
+  it_behaves_like "an RSpec block-only matcher", :disallows_negation => true do
+    let(:matcher) { change { @k }.to(2) }
+    before { @k = 0 }
+    def valid_block
+      @k = 2
+    end
+    def invalid_block
+      @k = 3
+    end
   end
 end

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/compound_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/compound_spec.rb Changed

@@ -262,12 +262,12 @@
 
     describe "expect(...).to matcher.and(other_matcher)" do
 
-      it_behaves_like "an RSpec matcher", :valid_value => 3, :invalid_value => 4, :disallows_negation => true do
+      it_behaves_like "an RSpec value matcher", :valid_value => 3, :invalid_value => 4, :disallows_negation => true do
         let(:matcher) { eq(3).and be <= 3 }
       end
 
       context 'when using boolean AND `&` alias' do
-        it_behaves_like "an RSpec matcher", :valid_value => 3, :invalid_value => 4, :disallows_negation => true do
+        it_behaves_like "an RSpec value matcher", :valid_value => 3, :invalid_value => 4, :disallows_negation => true do
           let(:matcher) { eq(3) & be_a(Integer) }
         end
       end
@@ -570,12 +570,12 @@
     end
 
     describe "expect(...).to matcher.or(other_matcher)" do
-      it_behaves_like "an RSpec matcher", :valid_value => 3, :invalid_value => 5, :disallows_negation => true do
+      it_behaves_like "an RSpec value matcher", :valid_value => 3, :invalid_value => 5, :disallows_negation => true do
         let(:matcher) { eq(3).or eq(4) }
       end
 
       context 'when using boolean OR `|` alias' do
-        it_behaves_like "an RSpec matcher", :valid_value => 3, :invalid_value => 5, :disallows_negation => true do
+        it_behaves_like "an RSpec value matcher", :valid_value => 3, :invalid_value => 5, :disallows_negation => true do
           let(:matcher) { eq(3) | eq(4) }
         end
       end

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/contain_exactly_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/contain_exactly_spec.rb Changed

@@ -148,7 +148,7 @@
 end
 
 RSpec.describe "expect(array).to contain_exactly(*other_array)" do
-  it_behaves_like "an RSpec matcher", :valid_value => 1, 2, :invalid_value => 1 do
+  it_behaves_like "an RSpec value matcher", :valid_value => 1, 2, :invalid_value => 1 do
     let(:matcher) { contain_exactly(2, 1) }
   end
 
@@ -473,6 +473,32 @@
   end
 end
 
+RSpec.describe "Reusing a matcher that memoizes state" do
+  require "rspec/matchers/fail_matchers"
+
+  it "works properly in spite of the memoization" do
+    matcher = contain_exactly(eq(1))
+
+    expect {
+      expect(2).to matcher
+    }.to fail_including(<<-MESSAGE)
+expected collection contained:  (eq 1)
+actual collection contained:    2
+the missing elements were:      (eq 1)
+the extra elements were:        2
+    MESSAGE
+
+    expect {
+      expect(3).to matcher
+    }.to fail_including(<<-MESSAGE)
+expected collection contained:  (eq 1)
+actual collection contained:    3
+the missing elements were:      (eq 1)
+the extra elements were:        3
+    MESSAGE
+  end
+end
+
 module RSpec
   module Matchers
     module BuiltIn

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/cover_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/cover_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/eq_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/eq_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/eql_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/eql_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/equal_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/equal_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/exist_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/exist_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/has_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/has_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/have_attributes_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/have_attributes_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/include_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/include_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/match_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/match_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/output_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/output_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/raise_error_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/raise_error_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/respond_to_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/respond_to_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/satisfy_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/satisfy_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/start_and_end_with_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/start_and_end_with_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/throw_symbol_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/throw_symbol_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/built_in/yield_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/built_in/yield_spec.rb Changed

@@ -29,15 +29,36 @@
   end
 end
 
+# NOTE: `yield` passes a probe to expect an that probe should be passed
+# to expectation target. This is different from the other block matchers.
+# Due to strict requirement in Ruby 1.8 to call a block with arguments if
+# the block is declared to accept them. To work around this limitation,
+# this example group overrides the default definition of expectations
+# and lambdas that take the expectation target in a way that they accept
+# a probe.
+RSpec.shared_examples "an RSpec probe-yielding block-only matcher" do |*options|
+  include_examples "an RSpec block-only matcher", { :expects_lambda => true }.merge(options.first || {}) do
+    let(:valid_expectation) { expect { |block| valid_block(&block) } }
+    let(:invalid_expectation) { expect { |block| invalid_block(&block) } }
+
+    let(:valid_block_lambda) { lambda { |block| valid_block(&block) } }
+    let(:invalid_block_lambda) { lambda { |block| invalid_block(&block) } }
+  end
+end
+
 RSpec.describe "yield_control matcher" do
   include YieldHelpers
   extend  YieldHelpers
 
-  it_behaves_like "an RSpec matcher",
-      :valid_value => lambda { |b| _yield_with_no_args(&b) },
-      :invalid_value => lambda { |b| _dont_yield(&b) },
+  it_behaves_like "an RSpec probe-yielding block-only matcher",
       :failure_message_uses_no_inspect => true do
     let(:matcher) { yield_control }
+    def valid_block(&block)
+      _yield_with_no_args(&block)
+    end
+    def invalid_block(&block)
+      _dont_yield(&block)
+    end
   end
 
   it 'has a description' do
@@ -244,10 +265,14 @@
   include YieldHelpers
   extend  YieldHelpers
 
-  it_behaves_like "an RSpec matcher",
-      :valid_value => lambda { |b| _yield_with_no_args(&b) },
-      :invalid_value => lambda { |b| _yield_with_args(1, &b) } do
+  it_behaves_like "an RSpec probe-yielding block-only matcher" do
     let(:matcher) { yield_with_no_args }
+    def valid_block(&block)
+      _yield_with_no_args(&block)
+    end
+    def invalid_block(&block)
+      _yield_with_args(1, &block)
+    end
   end
 
   it 'has a description' do
@@ -327,10 +352,14 @@
   include YieldHelpers
   extend  YieldHelpers
 
-  it_behaves_like "an RSpec matcher",
-      :valid_value => lambda { |b| _yield_with_args(1, &b) },
-      :invalid_value => lambda { |b| _yield_with_args(2, &b) } do
+  it_behaves_like "an RSpec probe-yielding block-only matcher" do
     let(:matcher) { yield_with_args(1) }
+    def valid_block(&block)
+      _yield_with_args(1, &block)
+    end
+    def invalid_block(&block)
+      _yield_with_args(2, &block)
+    end
   end
 
   it 'has a description' do
@@ -587,10 +616,14 @@
   include YieldHelpers
   extend  YieldHelpers
 
-  it_behaves_like "an RSpec matcher",
-      :valid_value => lambda { |b| 1, 2.each(&b) },
-      :invalid_value => lambda { |b| 3, 4.each(&b) } do
+  it_behaves_like "an RSpec probe-yielding block-only matcher" do
     let(:matcher) { yield_successive_args(1, 2) }
+    def valid_block(&block)
+      1, 2.each(&block)
+    end
+    def invalid_block(&block)
+      3, 4.each(&block)
+    end
   end
 
   it 'has a description' do

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/define_negated_matcher_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/define_negated_matcher_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers/dsl_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers/dsl_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/rspec/matchers_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/matchers_spec.rb Changed

_service:tar_scm:v3.10.2.tar.gz/spec/spec_helper.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/spec_helper.rb Changed

_service:tar_scm:v3.12.1.tar.gz/spec/support/shared_examples Added

_service:tar_scm:v3.12.1.tar.gz/spec/support/shared_examples/block_matcher.rb Added

@@ -0,0 +1,95 @@
+RSpec.shared_examples "an RSpec block-only matcher" do |*options|
+  # Note: Ruby 1.8 expects you to call a block with arguments if it is
+  # declared that accept arguments. In this case, some of the specs
+  # that include examples from this shared example group do not pass
+  # arguments. A workaround is to use splat and pick the first argument
+  # if it was passed.
+  options = options.first || {}
+
+  # Note: do not use `matcher` in 2 expectation expressions in a single
+  # example here. In some cases (such as `change { x += 2 }.to(2)`), it
+  # will fail because using it a second time will apply `x += 2` twice,
+  # changing the value to 4.
+
+  matcher :always_passes do
+    supports_block_expectations
+    match do |actual|
+      actual.call
+      true
+    end
+  end
+
+  matcher :always_fails do
+    supports_block_expectations
+    match do |actual|
+      actual.call
+      false
+    end
+  end
+
+  let(:valid_expectation) { expect { valid_block } }
+  let(:invalid_expectation) { expect { invalid_block } }
+
+  let(:valid_block_lambda) { lambda { valid_block } }
+  let(:invalid_block_lambda) { lambda { invalid_block } }
+
+  include_examples "an RSpec matcher", options
+
+  it 'preserves the symmetric property of `==`' do
+    expect(matcher).to eq(matcher)
+    expect(matcher).not_to eq(valid_block_lambda)
+    expect(valid_block_lambda).not_to eq(matcher)
+  end
+
+  it 'matches a valid block when using #=== so it can be composed' do
+    expect(matcher).to be === valid_block_lambda
+  end
+
+  it 'does not match an invalid block when using #=== so it can be composed' do
+    expect(matcher).not_to be === invalid_block_lambda
+  end
+
+  it 'matches a valid block when using #=== so it can be composed' do
+    expect(matcher).to be === valid_block_lambda
+  end
+
+  it 'does not match an invalid block when using #=== so it can be composed' do
+    expect(matcher).not_to be === invalid_block_lambda
+  end
+
+  it 'uses the `ObjectFormatter` for `failure_message`' do
+    allow(RSpec::Support::ObjectFormatter).to receive(:format).and_return("detailed inspect")
+    expect { invalid_expectation.to matcher }.to raise_error do |error|
+      # Undo our stub so it doesn't affect the `include` matcher below.
+      allow(RSpec::Support::ObjectFormatter).to receive(:format).and_call_original
+      expect(error.message).to include("detailed inspect")
+    end
+  end unless options:failure_message_uses_no_inspect
+
+  it 'fails gracefully when given a value' do
+    expect {
+      expect(3).to matcher
+    }.to fail_with(/was not( given)? a block/)
+
+    unless options:disallows_negation
+      expect {
+        expect(3).not_to matcher
+      }.to fail_with(/was not( given)? a block/)
+    end
+  end
+
+  it 'prints a deprecation warning when given a value' do
+    expect_warn_deprecation(/The implicit block expectation syntax is deprecated, you should pass/)
+    expect { expect(3).to matcher }.to fail
+  end unless options:skip_deprecation_check || options:expects_lambda
+
+  it 'prints a deprecation warning when given a value and negated' do
+    expect_warn_deprecation(/The implicit block expectation syntax is deprecated, you should pass/)
+    expect { expect(3).not_to matcher }.to fail
+  end unless options:disallows_negation || options:expects_lambda
+
+  it 'allows lambda expectation target' do
+    allow_deprecation
+    expect(valid_block_lambda).to matcher
+  end
+end

_service:tar_scm:v3.12.1.tar.gz/spec/support/shared_examples/matcher.rb Added

@@ -0,0 +1,44 @@
+RSpec.shared_examples "an RSpec matcher" do |options|
+  # Note: do not use `matcher` in 2 expectation expressions in a single
+  # example here. In some cases (such as `change { }.to(2)`), it will fail
+  # because using it a second time will apply `x += 2` twice, changing
+  # the value to 4.
+
+  it 'allows additional matchers to be chained off it using `and`' do
+    valid_expectation.to matcher.and always_passes
+  end
+
+  it 'can be chained off of an existing matcher using `and`' do
+    valid_expectation.to always_passes.and matcher
+  end
+
+  it 'allows additional matchers to be chained off it using `or`' do
+    valid_expectation.to matcher.or always_fails
+  end
+
+  it 'can be chained off of an existing matcher using `or`' do
+    valid_expectation.to always_fails.or matcher
+  end
+
+  it 'implements the full matcher protocol' do
+    expect(matcher).to respond_to(
+      :matches?,
+      :failure_message,
+      :description,
+      :supports_block_expectations?,
+      :supports_value_expectations?,
+      :expects_call_stack_jump?
+    )
+
+    # We do not require failure_message_when_negated and does_not_match?
+    # Because some matchers purposefully do not support negation.
+  end
+
+  it 'can match negatively properly' do
+    invalid_expectation.not_to matcher
+
+    expect {
+      valid_expectation.not_to matcher
+    }.to fail
+  end unless options:disallows_negation
+end

_service:tar_scm:v3.12.1.tar.gz/spec/support/shared_examples/value_matcher.rb Added

@@ -0,0 +1,66 @@
+RSpec.shared_examples "an RSpec value matcher" do |options|
+  let(:valid_value)   { options.fetch(:valid_value) }
+  let(:invalid_value) { options.fetch(:invalid_value) }
+
+  matcher :always_passes do
+    match { |_actual| true }
+  end
+
+  matcher :always_fails do
+    match { |_actual| false }
+  end
+
+  def valid_expectation
+    expect(valid_value)
+  end
+
+  def invalid_expectation
+    expect(invalid_value)
+  end
+
+  include_examples "an RSpec matcher", options
+
+  it 'preserves the symmetric property of `==`' do
+    expect(matcher).to eq(matcher)
+    expect(matcher).not_to eq(valid_value)
+    expect(valid_value).not_to eq(matcher)
+  end
+
+  it 'matches a valid value when using #=== so it can be composed' do
+    expect(matcher).to be === valid_value
+  end
+
+  it 'does not match an invalid value when using #=== so it can be composed' do
+    expect(matcher).not_to be === invalid_value
+  end
+
+  it 'can be used in a composed matcher expression' do
+    expect(valid_value, invalid_value).to include(matcher)
+
+    expect {
+      expect(invalid_value).to include(matcher)
+    }.to fail_including("include (#{matcher.description})")
+  end
+
+  it 'uses the `ObjectFormatter` for `failure_message`' do
+    allow(RSpec::Support::ObjectFormatter).to receive(:format).and_return("detailed inspect")
+    matcher.matches?(invalid_value)
+    message = matcher.failure_message
+
+    # Undo our stub so it doesn't affect the `include` matcher below.
+    allow(RSpec::Support::ObjectFormatter).to receive(:format).and_call_original
+    expect(message).to include("detailed inspect")
+  end
+
+  it 'fails when given a block' do
+    expect {
+      expect { 2 + 2 }.to matcher
+    }.to fail_with(/must pass an argument rather than a block/)
+
+    unless options:disallows_negation
+      expect {
+        expect { 2 + 2 }.not_to matcher
+      }.to fail_with(/must pass an argument rather than a block/)
+    end
+  end
+end

Changes of Revision 2