rspec-expectations 3.13.1 → 3.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de739c3ced3dfe0c29aad887b8aefef44b04b826a0315265289f21f7a9bcf4de
-  data.tar.gz: 969d3de594cc6061f2f197df757abb248359d139594ce23087c10f5c565ba88d
+  metadata.gz: 2326091f61f5fccf3b86b2275c850340614475381f32a9f22417cb9f59b80ab3
+  data.tar.gz: 7602b8b98d0dc9fecc754156a01686a131fedd6d43fe1b8ce8f689f0fba3b469
 SHA512:
-  metadata.gz: 4fde1836ea6689705e559d087433f4f7f3d239555e79e6f9d5f65b3c3d1cccb671e8dd40e60b88ae223fba347d59afc1e502c48f7ccceccb6dfbcf875abd46a7
-  data.tar.gz: f68303aaa957bdd48e2062bc0b00c43810740712879a8e93343eb602e58218958133cd9b55a25c4f006fb10fad295b204b404b1b5bf428a945bf5b3c719624ff
+  metadata.gz: 21d9a95f4e9cb3fa1b7fb99419861bc90a39ee33b4fa183a1018ab351d830168bd93fb02e00452344e1c8d9824bc3d0543b988e42288396c8a3091b9fc5d6f9c
+  data.tar.gz: ec4864365250340370d370af68dee725f3d018e414e57506d21d173e9d0a69a9df258f7d7a11e8f2ff583f4060348a76bb3251aa09a29add0ddee6fb2b0d4192

data/Changelog.md

@@ -1,5 +1,24 @@
 ### Development
-[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.13.1...3-13-maintenance)
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.13.3...3-13-maintenance)
+
+### 3.13.3 / 2024-09-07
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.13.2...v3.13.3)
+
+Bug Fixes:
+
+* Fix passing a regular expression to the `include` matcher without a count constraint.
+  (Jon Rowe, #1485)
+
+### 3.13.2 / 2024-08-20
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.13.1...v3.13.2)
+
+Bug Fixes:
+
+* When using null object doubles, prevent typos triggering dynamic matchers.
+  (Eric Mueller, #1455)
+* Use `RSpec.warning` for an expectation warning rather than `Kernel.warn`. (Jon Rowe, #1472)
+* Prevent mismatched use of block and value matchers in compound expectations. (Phil Pirozhkov, #1476)
+* Raise an error when passing no arguments to the `include` matcher. (Eric Mueller, #1479)
 
 ### 3.13.1 / 2024-06-13
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.13.0...v3.13.1)

data/lib/rspec/expectations/block_snippet_extractor.rb

@@ -46,11 +46,13 @@ module RSpec
           RSpec.world.source_from_file(file_path)
         end
       else
+        # :nocov:
         RSpec::Support.require_rspec_support 'source'
         def source
           raise TargetNotFoundError unless File.exist?(file_path)
           @source ||= RSpec::Support::Source.from_file(file_path)
         end
+        # :nocov:
       end
 
       def file_path

data/lib/rspec/expectations/configuration.rb

@@ -89,6 +89,7 @@ module RSpec
           ::RSpec.configuration.color_enabled?
         end
       else
+        # :nocov:
         # Indicates whether or not diffs should be colored.
         # Delegates to rspec-core's color option if rspec-core
         # is loaded; otherwise you can set it here.
@@ -100,8 +101,11 @@ module RSpec
         def color?
           defined?(@color) && @color
         end
+        # :nocov:
       end
 
+      # :nocov: Because this is only really _useful_ on 1.8, and hard to test elsewhere.
+      #
       # Adds `should` and `should_not` to the given classes
       # or modules. This can be used to ensure `should` works
       # properly on things like proxy objects (particular
@@ -114,6 +118,7 @@ module RSpec
           Expectations::Syntax.enable_should(mod)
         end
       end
+      # :nocov:
 
       # Sets or gets the backtrace formatter. The backtrace formatter should
       # implement `#format_backtrace(Array<String>)`. This is used

data/lib/rspec/expectations/failure_aggregator.rb

@@ -6,6 +6,10 @@ module RSpec
 
       # @private
       class AggregatedFailure
+        # :nocov:
+        # `inspect` was apparently used by some versions early in ruby 3 while constructing
+        # NoMethodError, but seems to be no longer.
+        #
         # @private
         MESSAGE =
           'AggregatedFailure: This method caused a failure which has been ' \
@@ -15,6 +19,7 @@ module RSpec
         def inspect
           MESSAGE
         end
+        # :nocov:
       end
 
       AGGREGATED_FAILURE = AggregatedFailure.new
@@ -75,11 +80,13 @@ module RSpec
         # a backtrace that has a continuous common section with the raised `MultipleExpectationsNotMetError`,
         # so that rspec-core's truncation logic can work properly on it to list the backtrace
         # relative to the `aggregate_failures` block.
+        # :nocov:
         def assign_backtrace(failure)
           raise failure
         rescue failure.class => e
           failure.set_backtrace(e.backtrace)
         end
+        # :nocov:
       else
         # Using `caller` performs better (and is simpler) than `raise` on most Rubies.
         def assign_backtrace(failure)

data/lib/rspec/expectations/handler.rb

@@ -4,11 +4,10 @@ module RSpec
     module ExpectationHelper
       def self.check_message(msg)
         unless msg.nil? || msg.respond_to?(:to_str) || msg.respond_to?(:call)
-          ::Kernel.warn [
-            "WARNING: ignoring the provided expectation message argument (",
-            msg.inspect,
-            ") since it is not a string or a proc."
-          ].join
+          RSpec.warning(
+            "ignoring the provided expectation message argument" \
+            "(#{ msg.inspect }) since it is not a string or a proc"
+          )
         end
       end
 

data/lib/rspec/expectations/version.rb

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

data/lib/rspec/matchers/built_in/base_matcher.rb

@@ -124,24 +124,6 @@ module RSpec
         end
         private_class_method :underscore
 
-      private
-
-        def assert_ivars(*expected_ivars)
-          return unless (expected_ivars - present_ivars).any?
-          ivar_list = EnglishPhrasing.list(expected_ivars)
-          raise "#{self.class.name} needs to supply#{ivar_list}"
-        end
-
-        if RUBY_VERSION.to_f < 1.9
-          # :nocov:
-          def present_ivars
-            instance_variables.map(&:to_sym)
-          end
-          # :nocov:
-        else
-          alias present_ivars instance_variables
-        end
-
         # @private
         module HashFormatting
           # `{ :a => 5, :b => 2 }.inspect` produces:
@@ -174,9 +156,11 @@ module RSpec
           else
             # @api private
             # @return [Boolean] False always as the curent Ruby version does not support String encoding
+            # :nocov:
             def string_encoding_differs?
               false
             end
+            # :nocov:
           end
           module_function :string_encoding_differs?
 
@@ -193,9 +177,11 @@ module RSpec
             # Formats a String's encoding as a human readable string
             # @param _value [String]
             # @return [nil] nil as the curent Ruby version does not support String encoding
+            # :nocov:
             def format_encoding(_value)
               nil
             end
+            # :nocov:
           end
           module_function :format_encoding
         end

data/lib/rspec/matchers/built_in/change.rb

@@ -440,9 +440,11 @@ module RSpec
             Expectations::BlockSnippetExtractor.try_extracting_single_line_body_of(@value_proc, @matcher_name)
           end
         else
+          # :nocov:
           def extract_value_block_snippet
             nil
           end
+          # :nocov:
         end
       end
     end

data/lib/rspec/matchers/built_in/compound.rb

@@ -77,8 +77,11 @@ module RSpec
         def match(_expected, actual)
           evaluator_klass = if supports_block_expectations? && Proc === actual
                               NestedEvaluator
-                            else
+                            elsif supports_value_expectations?
                               SequentialEvaluator
+                            else
+                              # Can't raise an ArgumentError in this context, as it's rescued
+                              raise "Block and value matchers can't be combined in a compound expectation (#{matcher_1.description}, #{matcher_2.description})"
                             end
 
           @evaluator = evaluator_klass.new(actual, matcher_1, matcher_2)

data/lib/rspec/matchers/built_in/contain_exactly.rb

@@ -108,12 +108,14 @@ module RSpec
         end
 
         if RUBY_VERSION == "1.8.7"
+          # :nocov:
           def to_a_disallowed?(object)
             case object
             when NilClass, String then true
             else Kernel == RSpec::Support.method_handle_for(object, :to_a).owner
             end
           end
+          # :nocov:
         else
           def to_a_disallowed?(object)
             NilClass === object

data/lib/rspec/matchers/built_in/count_expectation.rb

@@ -61,9 +61,11 @@ module RSpec
             count.cover?(number)
           end
         else
+          # :nocov:
           def cover?(count, number)
             number >= count.first && number <= count.last
           end
+          # :nocov:
         end
 
         def expected_count_matches?(actual_count)

data/lib/rspec/matchers/built_in/has.rb

@@ -46,8 +46,27 @@ module RSpec
 
       private
 
+        # Catch a semi-frequent typo - if you have strict_predicate_matchers disabled and
+        # expect(spy).to have_receieveddd(:foo) it would be evergreen - the dynamic matcher
+        # queries `has_receiveddd?`, the spy _fakes_ the method, returning its (truthy) self.
+        if defined?(RSpec::Mocks::Double)
+          def really_responds_to?(method)
+            if RSpec::Mocks::Double === @actual
+              @actual.respond_to?(method) && methods_include?(method)
+            else
+              @actual.respond_to?(method)
+            end
+          end
+        else
+          # :nocov:
+          def really_responds_to?(method)
+            @actual.respond_to?(method)
+          end
+          # :nocov:
+        end
+
         def predicate_accessible?
-          @actual.respond_to? predicate
+          really_responds_to?(predicate)
         end
 
         # support 1.8.7, evaluate once at load time for performance
@@ -56,11 +75,19 @@ module RSpec
           def private_predicate?
             @actual.private_methods.include? predicate.to_s
           end
+
+          def methods_include?(method)
+            @actual.methods.include?(method.to_s)
+          end
           # :nocov:
         else
           def private_predicate?
             @actual.private_methods.include? predicate
           end
+
+          def methods_include?(method)
+            @actual.methods.include?(method)
+          end
         end
 
         def predicate_result
@@ -155,7 +182,7 @@ module RSpec
         end
 
         def predicate_accessible?
-          super || actual.respond_to?(present_tense_predicate)
+          super || really_responds_to?(present_tense_predicate)
         end
 
         def present_tense_predicate

data/lib/rspec/matchers/built_in/include.rb

@@ -13,6 +13,7 @@ module RSpec
 
         # @api private
         def initialize(*expecteds)
+          raise(ArgumentError, 'include() is not supported, please supply an argument') if expecteds.empty?
           @expecteds = expecteds
         end
 
@@ -165,6 +166,7 @@ module RSpec
         end
 
         def actual_collection_includes?(expected_item)
+          return actual.scan(expected_item).size > 0 if Regexp === expected_item && String === actual
           return true if actual.include?(expected_item)
 
           # String lacks an `any?` method...
@@ -174,9 +176,11 @@ module RSpec
         end
 
         if RUBY_VERSION < '1.9'
+          # :nocov:
           def count_enumerable(expected_item)
             actual.select { |value| values_match?(expected_item, value) }.size
           end
+          # :nocov:
         else
           def count_enumerable(expected_item)
             actual.count { |value| values_match?(expected_item, value) }
@@ -197,6 +201,7 @@ module RSpec
 
         def diff_would_wrongly_highlight_matched_item?
           return false unless actual.is_a?(String) && expected.is_a?(Array)
+          return false if Regexp === expecteds.first
 
           lines = actual.split("\n")
           expected.any? do |str|

data/lib/rspec/matchers/built_in/match.rb

@@ -78,9 +78,11 @@ module RSpec
           # @api private
           # Returns match data names for named captures
           # @return Array
+          # :nocov:
           def names
             []
           end
+          # :nocov:
         else
           # @api private
           # Returns match data names for named captures

data/lib/rspec/matchers/built_in/satisfy.rb

@@ -50,9 +50,11 @@ module RSpec
             Expectations::BlockSnippetExtractor.try_extracting_single_line_body_of(@block, matcher_name)
           end
         else
+          # :nocov:
           def block_representation
             'block'
           end
+          # :nocov:
         end
       end
     end

data/lib/rspec/matchers/english_phrasing.rb

@@ -45,12 +45,14 @@ module RSpec
         # So here we replace `Kernel#Array` with our own warning-free implementation for 1.8.7.
         # @private
         # rubocop:disable Naming/MethodName
+        # :nocov:
         def self.Array(obj)
           case obj
           when Array then obj
           else [obj]
           end
         end
+        # :nocov:
         # rubocop:enable Naming/MethodName
       end
     end

data/lib/rspec/matchers.rb

@@ -1018,6 +1018,7 @@ module RSpec
         # than _before_, like `append_features`. It's important we check this before
         # in order to find the cases where it was already previously included.
         # @api private
+        # :nocov:
         def append_features(mod)
           return super if mod < self # `mod < self` indicates a re-inclusion.
 
@@ -1038,6 +1039,7 @@ module RSpec
 
           super
         end
+        # :nocov:
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 3.13.3
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -203,7 +203,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-expectations/issues
-  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.13.1/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.13.3/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 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: rspec-expectations-3.13.1
+summary: rspec-expectations-3.13.3
 test_files: []