rspec-expectations 3.8.5 → 3.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58597a62f47f10ecd74eda0086bcee4ca68878120d63cc670ebae37f9db1d252
-  data.tar.gz: 7443ec753991ae3c88ac9be2e8a22aab784b7e10bd2be481bf8a83daf3b85778
+  metadata.gz: d1f0c43e7a6933605f4b96eb0a5545bd5e1b03a2b2de4471edada5000f3c5c37
+  data.tar.gz: 62b85e7625d066114174dfaa586dbb2cb419aa0bc470b68918c2524b841f8762
 SHA512:
-  metadata.gz: 36dab83e0399bbf5c58f17f3302c865ca4ec92123c97cc6eea1f9bf80a5466e643adfbd3056e46a653c5bbc08fc93f5d804bc9ca4a2e841468b22f09e2a140ec
-  data.tar.gz: f4b9263c27571536fa276eefee5a2c115a9f1f3d070f1abcaf4fba9e5e2cd2f11e04f48d146c870b26d019f6fb8533b3e2b605ff422ab32832f51d1531743515
+  metadata.gz: 5ba237ec4317b7af0780f5e929e10da26b501f76a23cb807684498a21118ef0f72598c1ded7ee0436a8a29f97ea16a0d4f887c7b345b22302f5b8ef50c660beb
+  data.tar.gz: 4138b8b208b668216660d55f5634440e8240c4a36f15489fc3e1e6093d4a8530fc419d9f958ea4526ac63e7e9e2d589c7716a21832d257adac823486d5dfae77

data.tar.gz.sig

@@ -1,4 +1,5 @@
-���_��\���m��2��r��Ui��5sF
-Y��Z[�X0�ֆ�#+���긲����':����9�"��@��,�7}��6l�w�|-#삎���
-8ז���������v���Wq!M�w���m�ulq
-u�n�E��q?�ਰ?��֕7-#�8g$XS�/�r�/���ͩc��J�Z�dh�ke;(�/���B�!i�J�ߟߜ1�Ɋ�9J�#]�/ ��y��T3]"�dZV=�4mB��P�����x�f|J
-����}�F����=��\���s�v�=��n��J@�0���w��cz�5�V�[���<�
/�0�E]Xp��y�͝&��Ö;���A� �V%�g;m�����a`Y�uϥ����}�igo��d3�Mw[���3�׶�n6��g,13I�����0q!��fƦ�����
v�^;|F:������,��
+p]���[���03$�iė?��
+�6s���1ϑ�x����6n�������7�u��
+
"�l����@򣙅!;E��(c}=>8�a���Br {��	 5�����e�����?O�7�Q�����g�f�Ip+�H;m�-�#\ �d�uZ�7�����8s�kug��2G+'1m')�V���
��L�5^(�����L�0F�b8q��੦h�T�:�
X�zB-тϳ.(��A������q}&b̟o���
�&�e�+��C��ø.��c���9|v��)h��C*�6،��	d۳
+h�{�Q�'���l�F׈�7��������h��)#g����{�\�u9&��M�����l��
+�a���$<�|�}5�
������}S�#��KW#c-�r�	����t~�O�+T[���#H�X�,&��)��^�!�ٓڿr���������	���}��=dk<�N�"3��u�\�22��8Y��'�M[�i�T�ɚ�|?

data/Changelog.md

@@ -1,3 +1,10 @@
+### 3.8.6 / 2019-10-07
+
+Bug Fixes:
+
+* Revert #1125 due to the change being incompatible with our semantic versioning
+  policy.
+
 ### 3.8.5 / 2019-10-02
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.8.4...v3.8.5)
 
@@ -22,7 +29,7 @@ Bug Fixes:
 * 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, #1100)
+  (Phil Pirozhkov, #1110)
 * 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)

data/lib/rspec/expectations/expectation_target.rb

@@ -33,16 +33,16 @@ module RSpec
       end
 
       # @private
-      def self.for(value, &block)
+      def self.for(value, block)
         if UndefinedValue.equal?(value)
-          unless block_given?
+          unless block
             raise ArgumentError, "You must pass either an argument or a block to `expect`."
           end
           BlockExpectationTarget.new(block)
-        elsif block_given?
+        elsif block
           raise ArgumentError, "You cannot pass both an argument and a block to `expect`."
         else
-          ValueExpectationTarget.new(value)
+          new(value)
         end
       end
 
@@ -90,40 +90,6 @@ module RSpec
       include InstanceMethods
     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 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)
-
-        raise ExpectationNotMetError, "You must pass a block rather than an argument to `expect` to use the provided " \
-          "block expectation matcher (#{RSpec::Support::ObjectFormatter.format(matcher)})."
-      end
-
-      def supports_value_expectations?(matcher)
-        if matcher.respond_to?(:supports_value_expectations?)
-          matcher.supports_value_expectations?
-        else
-          true
-        end
-      end
-    end
-
     # @private
     # Validates the provided matcher to ensure it supports block
     # expectations, in order to avoid user confusion when they
@@ -152,11 +118,9 @@ module RSpec
       end
 
       def supports_block_expectations?(matcher)
-        if matcher.respond_to?(:supports_block_expectations?)
-          matcher.supports_block_expectations?
-        else
-          false
-        end
+        matcher.supports_block_expectations?
+      rescue NoMethodError
+        false
       end
     end
   end

data/lib/rspec/expectations/syntax.rb

@@ -70,7 +70,7 @@ module RSpec
 
         syntax_host.module_exec do
           def expect(value=::RSpec::Expectations::ExpectationTarget::UndefinedValue, &block)
-            ::RSpec::Expectations::ExpectationTarget.for(value, &block)
+            ::RSpec::Expectations::ExpectationTarget.for(value, block)
           end
         end
       end

data/lib/rspec/expectations/version.rb

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

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

@@ -78,11 +78,6 @@ module RSpec
           false
         end
 
-        # @private
-        def supports_value_expectations?
-          true
-        end
-
         # @api private
         def expects_call_stack_jump?
           false

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

@@ -77,11 +77,6 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def initialize(receiver=nil, message=nil, &block)
@@ -112,10 +107,12 @@ module RSpec
         end
 
         def positive_failure_reason
+          return "was not given a block" unless Proc === @event_proc
           "is still #{@actual_before_description}"
         end
 
         def negative_failure_reason
+          return "was not given a block" unless Proc === @event_proc
           "did change from #{@actual_before_description} " \
           "to #{description_of change_details.actual_after}"
         end
@@ -161,14 +158,10 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def failure_reason
+          return "was not given a block" unless Proc === @event_proc
           "was changed by #{description_of @change_details.actual_delta}"
         end
       end
@@ -197,6 +190,7 @@ module RSpec
 
         # @private
         def failure_message
+          return not_given_a_block_failure unless Proc === @event_proc
           return before_value_failure      unless @matches_before
           return did_not_change_failure    unless @change_details.changed?
           after_value_failure
@@ -207,11 +201,6 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def perform_change(event_proc)
@@ -253,6 +242,11 @@ module RSpec
           "did change from #{@actual_before_description} " \
           "to #{description_of @change_details.actual_after}"
         end
+
+        def not_given_a_block_failure
+          "expected #{@change_details.value_representation} to have changed " \
+          "#{change_description}, but was not given a block"
+        end
       end
 
       # @api private
@@ -284,6 +278,7 @@ module RSpec
 
         # @private
         def failure_message_when_negated
+          return not_given_a_block_failure unless Proc === @event_proc
           return before_value_failure unless @matches_before
           did_change_failure
         end

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

@@ -26,19 +26,11 @@ module RSpec
           "#{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)
@@ -110,12 +102,6 @@ module RSpec
           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

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

@@ -94,13 +94,6 @@ module RSpec
           true
         end
 
-        # @api private
-        # Indicates this matcher matches against a block only.
-        # @return [False]
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def captured?
@@ -108,11 +101,13 @@ module RSpec
         end
 
         def positive_failure_reason
+          return "was not a block" unless Proc === @block
           return "output #{actual_output_description}" if @expected
           "did not"
         end
 
         def negative_failure_reason
+          return "was not a block" unless Proc === @block
           "output #{actual_output_description}"
         end
 

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

@@ -76,12 +76,6 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
-        # @private
         def expects_call_stack_jump?
           true
         end
@@ -205,6 +199,7 @@ module RSpec
         end
 
         def given_error
+          return " but was not given a block" unless Proc === @given_proc
           return " but nothing was raised" unless @actual_error
 
           backtrace = format_backtrace(@actual_error.backtrace)

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

@@ -88,16 +88,12 @@ module RSpec
         end
 
         # @api private
+        # Indicates this matcher matches against a block.
+        # @return [True]
         def supports_block_expectations?
           true
         end
 
-        # @api private
-        def supports_value_expectations?
-          false
-        end
-
-        # @api private
         def expects_call_stack_jump?
           true
         end
@@ -105,6 +101,7 @@ module RSpec
       private
 
         def actual_result
+          return "but was not a block" unless Proc === @block
           "got #{caught}"
         end
 

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

@@ -10,6 +10,7 @@ module RSpec
       class YieldProbe
         def self.probe(block, &callback)
           probe = new(block, &callback)
+          return probe unless probe.has_block?
           probe.probe
         end
 
@@ -23,6 +24,10 @@ module RSpec
           self.yielded_args = []
         end
 
+        def has_block?
+          Proc === @block
+        end
+
         def probe
           assert_valid_expect_block!
           @block.call(self)
@@ -147,12 +152,14 @@ module RSpec
         # @private
         def matches?(block)
           @probe = YieldProbe.probe(block)
+          return false unless @probe.has_block?
+
           @probe.num_yields.__send__(@expectation_type, @expected_yields_count)
         end
 
         # @private
         def does_not_match?(block)
-          !matches?(block)
+          !matches?(block) && @probe.has_block?
         end
 
         # @api private
@@ -172,11 +179,6 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def set_expected_yields_count(relativity, n)
@@ -190,6 +192,7 @@ module RSpec
         end
 
         def failure_reason
+          return ' but was not a block' unless @probe.has_block?
           return '' unless @expected_yields_count
           " #{human_readable_expectation_type}#{human_readable_count(@expected_yields_count)}" \
           " but yielded #{human_readable_count(@probe.num_yields)}"
@@ -219,12 +222,13 @@ module RSpec
         # @private
         def matches?(block)
           @probe = YieldProbe.probe(block)
+          return false unless @probe.has_block?
           @probe.yielded_once?(:yield_with_no_args) && @probe.single_yield_args.empty?
         end
 
         # @private
         def does_not_match?(block)
-          !matches?(block)
+          !matches?(block) && @probe.has_block?
         end
 
         # @private
@@ -242,19 +246,16 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def positive_failure_reason
+          return 'was not a block' unless @probe.has_block?
           return 'did not yield' if @probe.num_yields.zero?
           "yielded with arguments: #{description_of @probe.single_yield_args}"
         end
 
         def negative_failure_reason
+          return 'was not a block' unless @probe.has_block?
           'did'
         end
       end
@@ -275,13 +276,14 @@ module RSpec
             @actual_formatted = actual_formatted
             @args_matched_when_yielded &&= args_currently_match?
           end
+          return false unless @probe.has_block?
           @probe.probe
           @probe.yielded_once?(:yield_with_args) && @args_matched_when_yielded
         end
 
         # @private
         def does_not_match?(block)
-          !matches?(block)
+          !matches?(block) && @probe.has_block?
         end
 
         # @private
@@ -306,14 +308,10 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def positive_failure_reason
+          return 'was not a block' unless @probe.has_block?
           return 'did not yield' if @probe.num_yields.zero?
           @positive_args_failure
         end
@@ -323,7 +321,9 @@ module RSpec
         end
 
         def negative_failure_reason
-          if @args_matched_when_yielded && !@expected.empty?
+          if !@probe.has_block?
+            'was not a block'
+          elsif @args_matched_when_yielded && !@expected.empty?
             'yielded with expected arguments' \
               "\nexpected not: #{surface_descriptions_in(@expected).inspect}" \
               "\n         got: #{@actual_formatted}"
@@ -375,11 +375,12 @@ module RSpec
             yield_count += 1
           end
 
+          return false unless @probe.has_block?
           args_matched_when_yielded && yield_count == @expected.length
         end
 
         def does_not_match?(block)
-          !matches?(block)
+          !matches?(block) && @probe.has_block?
         end
 
         # @private
@@ -404,11 +405,6 @@ module RSpec
           true
         end
 
-        # @private
-        def supports_value_expectations?
-          false
-        end
-
       private
 
         def expected_arg_description
@@ -416,12 +412,16 @@ module RSpec
         end
 
         def positive_failure_reason
+          return 'was not a block' unless @probe.has_block?
+
           'yielded with unexpected arguments' \
           "\nexpected: #{surface_descriptions_in(@expected).inspect}" \
           "\n     got: [#{@actual_formatted.join(", ")}]"
         end
 
         def negative_failure_reason
+          return 'was not a block' unless @probe.has_block?
+
           'yielded with expected arguments' \
           "\nexpected not: #{surface_descriptions_in(@expected).inspect}" \
           "\n         got: [#{@actual_formatted.join(", ")}]"

data/lib/rspec/matchers/dsl.rb

@@ -394,10 +394,6 @@ module RSpec
           false
         end
 
-        def supports_value_expectations?
-          true
-        end
-
         # Most matchers do not expect call stack jumps.
         def expects_call_stack_jump?
           false

data/lib/rspec/matchers/matcher_protocol.rb

@@ -60,12 +60,6 @@ module RSpec
       #   @return [Boolean] true if this matcher can be used in block expressions.
       #   @note If not defined, RSpec assumes a value of `false` for this method.
 
-      # @!method supports_value_expectations?
-      #   Indicates that this matcher can be used in a value expectation expression,
-      #   such as `expect(foo).to eq(bar)`.
-      #   @return [Boolean] true if this matcher can be used in value expressions.
-      #   @note If not defined, RSpec assumes a value of `true` for this method.
-
       # @!method expects_call_stack_jump?
       #   Indicates that when this matcher is used in a block expectation
       #   expression, it expects the block to use a ruby construct that causes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.8.5
+  version: 3.8.6
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -188,7 +188,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-expectations/issues
-  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.8.5/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-expectations/blob/v3.8.6/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-expectations
@@ -211,5 +211,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.8.5
+summary: rspec-expectations-3.8.6
 test_files: []