rspec-expectations 2.13.0 → 3.0.0

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

@@ -1,10 +1,15 @@
 module RSpec
   module Matchers
     module BuiltIn
+      # @private
+      # Object that is yielded to `expect` when one of the
+      # yield matchers is used. Provides information about
+      # the yield behavior of the object-under-test.
       class YieldProbe
         def self.probe(block)
-          probe = new
-          assert_valid_expect_block!(block)
+          probe = new(block)
+          return probe unless probe.has_block?
+          probe.assert_valid_expect_block!
           block.call(probe)
           probe.assert_used!
           probe
@@ -12,11 +17,16 @@ module RSpec
 
         attr_accessor :num_yields, :yielded_args
 
-        def initialize
+        def initialize(block)
+          @block = block
           @used = false
           self.num_yields, self.yielded_args = 0, []
         end
 
+        def has_block?
+          Proc === @block
+        end
+
         def to_proc
           @used = true
 
@@ -24,6 +34,7 @@ module RSpec
           Proc.new do |*args|
             probe.num_yields += 1
             probe.yielded_args << args
+            nil # to indicate the block does not return a meaningful value
           end
         end
 
@@ -57,95 +68,240 @@ module RSpec
                 "are."
         end
 
-        def self.assert_valid_expect_block!(block)
-          return if block.arity == 1
+        def assert_valid_expect_block!
+          return if @block.arity == 1
           raise "Your expect block must accept an argument to be used with this " +
                 "matcher. Pass the argument as a block on to the method you are testing."
         end
       end
 
+      # @api private
+      # Provides the implementation for `yield_control`.
+      # Not intended to be instantiated directly.
       class YieldControl < BaseMatcher
+        def initialize
+          @expectation_type = nil
+          @expected_yields_count = nil
+        end
+
+        # @api public
+        # Specifies that the method is expected to yield once.
+        def once
+          exactly(1)
+          self
+        end
+
+        # @api public
+        # Specifies that the method is expected to yield once.
+        def twice
+          exactly(2)
+          self
+        end
+
+        # @api public
+        # Specifies that the method is expected to yield the given number of times.
+        def exactly(number)
+          set_expected_yields_count(:==, number)
+          self
+        end
+
+        # @api public
+        # Specifies the maximum number of times the method is expected to yield
+        def at_most(number)
+          set_expected_yields_count(:<=, number)
+          self
+        end
+
+        # @api public
+        # Specifies the minimum number of times the method is expected to yield
+        def at_least(number)
+          set_expected_yields_count(:>=, number)
+          self
+        end
+
+        # @api public
+        # No-op. Provides syntactic sugar.
+        def times
+          self
+        end
+
+        # @private
         def matches?(block)
-          probe = YieldProbe.probe(block)
-          probe.yielded_once?(:yield_control)
+          @probe = YieldProbe.probe(block)
+          return false unless @probe.has_block?
+
+          if @expectation_type
+            @probe.num_yields.__send__(@expectation_type, @expected_yields_count)
+          else
+            @probe.yielded_once?(:yield_control)
+          end
+        end
+
+        # @private
+        def does_not_match?(block)
+          !matches?(block) && @probe.has_block?
+        end
+
+        # @api private
+        # @return [String]
+        def failure_message
+          'expected given block to yield control' + failure_reason
+        end
+
+        # @api private
+        # @return [String]
+        def failure_message_when_negated
+          'expected given block not to yield control' + failure_reason
         end
 
-        def failure_message_for_should
-          "expected given block to yield control"
+        # @private
+        def supports_block_expectations?
+          true
         end
 
-        def failure_message_for_should_not
-          "expected given block not to yield control"
+      private
+
+        def set_expected_yields_count(relativity, n)
+          @expectation_type = relativity
+          @expected_yields_count = case n
+                                   when Numeric then n
+                                   when :once then 1
+                                   when :twice then 2
+                                   end
+        end
+
+        def failure_reason
+          return " but was not a block" unless @probe.has_block?
+          return '' unless @expected_yields_count
+          " #{human_readable_expecation_type}#{human_readable_count}"
+        end
+
+        def human_readable_expecation_type
+          case @expectation_type
+          when :<= then 'at most '
+          when :>= then 'at least '
+          else ''
+          end
+        end
+
+        def human_readable_count
+          case @expected_yields_count
+          when 1 then "once"
+          when 2 then "twice"
+          else "#{@expected_yields_count} times"
+          end
         end
       end
 
+      # @api private
+      # Provides the implementation for `yield_with_no_args`.
+      # Not intended to be instantiated directly.
       class YieldWithNoArgs < BaseMatcher
-
+        # @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
 
-        def failure_message_for_should
-          "expected given block to yield with no arguments, but #{failure_reason}"
+        # @private
+        def does_not_match?(block)
+          !matches?(block) && @probe.has_block?
+        end
+
+        # @private
+        def failure_message
+          "expected given block to yield with no arguments, but #{positive_failure_reason}"
+        end
+
+        # @private
+        def failure_message_when_negated
+          "expected given block not to yield with no arguments, but #{negative_failure_reason}"
         end
 
-        def failure_message_for_should_not
-          "expected given block not to yield with no arguments, but did"
+        # @private
+        def supports_block_expectations?
+          true
         end
 
       private
 
-        def failure_reason
-          if @probe.num_yields.zero?
-            "did not yield"
-          else
-            "yielded with arguments: #{@probe.single_yield_args.inspect}"
-          end
+        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: #{@probe.single_yield_args.inspect}"
+        end
+
+        def negative_failure_reason
+          return "was not a block" unless @probe.has_block?
+          "did"
         end
       end
 
+      # @api private
+      # Provides the implementation for `yield_with_args`.
+      # Not intended to be instantiated directly.
       class YieldWithArgs
+        include Composable
+
         def initialize(*args)
           @expected = args
         end
 
+        # @private
         def matches?(block)
           @probe = YieldProbe.probe(block)
+          return false unless @probe.has_block?
           @actual = @probe.single_yield_args
           @probe.yielded_once?(:yield_with_args) && args_match?
         end
-        alias == matches?
 
-        def failure_message_for_should
+        # @private
+        def does_not_match?(block)
+          !matches?(block) && @probe.has_block?
+        end
+
+        # @private
+        def failure_message
           "expected given block to yield with arguments, but #{positive_failure_reason}"
         end
 
-        def failure_message_for_should_not
+        # @private
+        def failure_message_when_negated
           "expected given block not to yield with arguments, but #{negative_failure_reason}"
         end
 
+        # @private
         def description
           desc = "yield with args"
-          desc << "(" + @expected.map { |e| e.inspect }.join(", ") + ")" unless @expected.empty?
+          desc << "(#{expected_arg_description})" unless @expected.empty?
           desc
         end
 
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
       private
 
         def positive_failure_reason
-          if @probe.num_yields.zero?
-            "did not yield"
-          else
-            @positive_args_failure
-          end
+          return "was not a block" unless @probe.has_block?
+          return "did not yield" if @probe.num_yields.zero?
+          @positive_args_failure
+        end
+
+        def expected_arg_description
+          @expected.map { |e| description_of e }.join(", ")
         end
 
         def negative_failure_reason
-          if all_args_match?
+          if !@probe.has_block?
+            "was not a block"
+          elsif all_args_match?
             "yielded with expected arguments" +
-              "\nexpected not: #{@expected.inspect}" +
-              "\n         got: #{@actual.inspect} (compared using === and ==)"
+              "\nexpected not: #{surface_descriptions_in(@expected).inspect}" +
+              "\n         got: #{@actual.inspect}"
           else
             "did"
           end
@@ -159,60 +315,86 @@ module RSpec
 
           unless match = all_args_match?
             @positive_args_failure = "yielded with unexpected arguments" +
-              "\nexpected: #{@expected.inspect}" +
-              "\n     got: #{@actual.inspect} (compared using === and ==)"
+              "\nexpected: #{surface_descriptions_in(@expected).inspect}" +
+              "\n     got: #{@actual.inspect}"
           end
 
           match
         end
 
         def all_args_match?
-          return false if @expected.size != @actual.size
-
-          @expected.zip(@actual).all? do |expected, actual|
-            expected === actual || actual == expected
-          end
+          values_match?(@expected, @actual)
         end
       end
 
+      # @api private
+      # Provides the implementation for `yield_successive_args`.
+      # Not intended to be instantiated directly.
       class YieldSuccessiveArgs
+        include Composable
+
         def initialize(*args)
           @expected = args
         end
 
+        # @private
         def matches?(block)
           @probe = YieldProbe.probe(block)
+          return false unless @probe.has_block?
           @actual = @probe.successive_yield_args
           args_match?
         end
-        alias == matches?
 
-        def failure_message_for_should
-          "expected given block to yield successively with arguments, but yielded with unexpected arguments" +
-            "\nexpected: #{@expected.inspect}" +
-            "\n     got: #{@actual.inspect} (compared using === and ==)"
+        def does_not_match?(block)
+          !matches?(block) && @probe.has_block?
         end
 
-        def failure_message_for_should_not
-          "expected given block not to yield successively with arguments, but yielded with expected arguments" +
-              "\nexpected not: #{@expected.inspect}" +
-              "\n         got: #{@actual.inspect} (compared using === and ==)"
+        # @private
+        def failure_message
+          "expected given block to yield successively with arguments, but #{positive_failure_reason}"
         end
 
+        # @private
+        def failure_message_when_negated
+          "expected given block not to yield successively with arguments, but #{negative_failure_reason}"
+        end
+
+        # @private
         def description
           desc = "yield successive args"
-          desc << "(" + @expected.map { |e| e.inspect }.join(", ") + ")"
+          desc << "(#{expected_arg_description})"
           desc
         end
 
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
       private
 
         def args_match?
-          return false if @expected.size != @actual.size
+          values_match?(@expected, @actual)
+        end
 
-          @expected.zip(@actual).all? do |expected, actual|
-            expected === actual || actual == expected
-          end
+        def expected_arg_description
+          @expected.map { |e| description_of e }.join(", ")
+        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.inspect}"
+        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.inspect}"
         end
       end
     end

data/lib/rspec/matchers/built_in.rb

@@ -1,39 +1,51 @@
+RSpec::Support.require_rspec_matchers "built_in/base_matcher"
+
 module RSpec
   module Matchers
+    # Container module for all built-in matchers. The matcher classes are here
+    # (rather than directly under `RSpec::Matchers`) in order to prevent name
+    # collisions, since `RSpec::Matchers` gets included into the user's namespace.
+    #
+    # Autoloading is used to delay when the matcher classes get loaded, allowing
+    # rspec-matchers to boot faster, and avoiding loading matchers the user is
+    # not using.
     module BuiltIn
-      require 'rspec/matchers/built_in/base_matcher'
-      autoload :BeAnInstanceOf, 'rspec/matchers/built_in/be_instance_of'
-      autoload :Be,             'rspec/matchers/built_in/be'
-      autoload :BeTrue,         'rspec/matchers/built_in/be'
-      autoload :BeFalse,        'rspec/matchers/built_in/be'
-      autoload :BeNil,          'rspec/matchers/built_in/be'
-      autoload :BeComparedTo,   'rspec/matchers/built_in/be'
-      autoload :BePredicate,    'rspec/matchers/built_in/be'
-      autoload :BeAKindOf,      'rspec/matchers/built_in/be_kind_of'
-      autoload :BeWithin,       'rspec/matchers/built_in/be_within'
-      autoload :Change,         'rspec/matchers/built_in/change'
-      autoload :Cover,          'rspec/matchers/built_in/cover' if (1..2).respond_to?(:cover?)
-      autoload :Eq,             'rspec/matchers/built_in/eq'
-      autoload :Eql,            'rspec/matchers/built_in/eql'
-      autoload :Equal,          'rspec/matchers/built_in/equal'
-      autoload :Exist,          'rspec/matchers/built_in/exist'
-      autoload :Has,            'rspec/matchers/built_in/has'
-      autoload :Have,           'rspec/matchers/built_in/have'
-      autoload :Include,        'rspec/matchers/built_in/include'
-      autoload :Match,          'rspec/matchers/built_in/match'
-      autoload :MatchArray,     'rspec/matchers/built_in/match_array'
-      autoload :RaiseError,     'rspec/matchers/built_in/raise_error'
-      autoload :RespondTo,      'rspec/matchers/built_in/respond_to'
-      autoload :StartWith,      'rspec/matchers/built_in/start_and_end_with'
-      autoload :EndWith,        'rspec/matchers/built_in/start_and_end_with'
-      autoload :Satisfy,        'rspec/matchers/built_in/satisfy'
-      autoload :ThrowSymbol,    'rspec/matchers/built_in/throw_symbol'
-      autoload :YieldControl,   'rspec/matchers/built_in/yield'
-      autoload :YieldWithArgs,  'rspec/matchers/built_in/yield'
-      autoload :YieldWithNoArgs, 'rspec/matchers/built_in/yield'
-      autoload :YieldSuccessiveArgs, 'rspec/matchers/built_in/yield'
+      autoload :BeAKindOf,               'rspec/matchers/built_in/be_kind_of'
+      autoload :BeAnInstanceOf,          'rspec/matchers/built_in/be_instance_of'
+      autoload :BeBetween,               'rspec/matchers/built_in/be_between'
+      autoload :Be,                      'rspec/matchers/built_in/be'
+      autoload :BeComparedTo,            'rspec/matchers/built_in/be'
+      autoload :BeFalsey,                'rspec/matchers/built_in/be'
+      autoload :BeNil,                   'rspec/matchers/built_in/be'
+      autoload :BePredicate,             'rspec/matchers/built_in/be'
+      autoload :BeTruthy,                'rspec/matchers/built_in/be'
+      autoload :BeWithin,                'rspec/matchers/built_in/be_within'
+      autoload :Change,                  'rspec/matchers/built_in/change'
+      autoload :Compound,                'rspec/matchers/built_in/compound'
+      autoload :ContainExactly,          'rspec/matchers/built_in/contain_exactly'
+      autoload :Cover,                   'rspec/matchers/built_in/cover'
+      autoload :EndWith,                 'rspec/matchers/built_in/start_and_end_with'
+      autoload :Eq,                      'rspec/matchers/built_in/eq'
+      autoload :Eql,                     'rspec/matchers/built_in/eql'
+      autoload :Equal,                   'rspec/matchers/built_in/equal'
+      autoload :Exist,                   'rspec/matchers/built_in/exist'
+      autoload :Has,                     'rspec/matchers/built_in/has'
+      autoload :Include,                 'rspec/matchers/built_in/include'
+      autoload :All,                     'rspec/matchers/built_in/all'
+      autoload :Match,                   'rspec/matchers/built_in/match'
+      autoload :NegativeOperatorMatcher, 'rspec/matchers/built_in/operators'
+      autoload :OperatorMatcher,         'rspec/matchers/built_in/operators'
+      autoload :Output,                  'rspec/matchers/built_in/output'
+      autoload :PositiveOperatorMatcher, 'rspec/matchers/built_in/operators'
+      autoload :RaiseError,              'rspec/matchers/built_in/raise_error'
+      autoload :RespondTo,               'rspec/matchers/built_in/respond_to'
+      autoload :Satisfy,                 'rspec/matchers/built_in/satisfy'
+      autoload :StartWith,               'rspec/matchers/built_in/start_and_end_with'
+      autoload :ThrowSymbol,             'rspec/matchers/built_in/throw_symbol'
+      autoload :YieldControl,            'rspec/matchers/built_in/yield'
+      autoload :YieldSuccessiveArgs,     'rspec/matchers/built_in/yield'
+      autoload :YieldWithArgs,           'rspec/matchers/built_in/yield'
+      autoload :YieldWithNoArgs,         'rspec/matchers/built_in/yield'
     end
   end
 end
-
-