rspec-expectations 2.99.0.beta2 → 2.99.0.rc1

data/lib/rspec/expectations/syntax.rb

@@ -79,11 +79,9 @@ module RSpec
       def enable_expect(syntax_host = ::RSpec::Matchers)
         return if expect_enabled?(syntax_host)
 
-        syntax_host.module_eval do
-          def expect(*target, &target_block)
-            target << target_block if block_given?
-            raise ArgumentError.new("You must pass an argument or a block to #expect but not both.") unless target.size == 1
-            ::RSpec::Expectations::ExpectationTarget.new(target.first)
+        syntax_host.module_exec do
+          def expect(value=::RSpec::Expectations::ExpectationTarget::UndefinedValue, &block)
+            ::RSpec::Expectations::ExpectationTarget.for(value, block)
           end
         end
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.99.0.beta2'
+      STRING = '2.99.0.rc1'
     end
   end
 end

data/lib/rspec/matchers.rb

@@ -25,6 +25,7 @@ module RSpec
   #     does_not_match?(actual)
   #     failure_message_for_should_not
   #     description
+  #     supports_block_expectations?
   #
   # ## Predicates
   #
@@ -711,11 +712,17 @@ module RSpec
     BuiltIn::OperatorMatcher.register(Enumerable, '=~', BuiltIn::MatchArray)
 
     def self.const_missing(name)
-      return super unless name == :OperatorMatcher
-
-      RSpec.deprecate("RSpec::Matchers::OperatorMatcher",
-                      :replacement => "RSpec::Matchers::BuiltIn::OperatorMatcher")
-      BuiltIn::OperatorMatcher
+      case name
+        when :OperatorMatcher
+          RSpec.deprecate("`RSpec::Matchers::OperatorMatcher`",
+                          :replacement => "`RSpec::Matchers::BuiltIn::OperatorMatcher`")
+          BuiltIn::OperatorMatcher
+        when :Configuration
+          RSpec.deprecate("`RSpec::Matchers::Configuration`",
+                          :replacement => "`RSpec::Expectations::Configuration`")
+          Expectations::Configuration
+        else super
+      end
     end
   end
 end

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

@@ -40,12 +40,12 @@ module RSpec
 
         def failure_message_for_should
           assert_ivars :@actual
-          "expected #{@actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"
+          "expected #{@actual.inspect} to #{name_to_sentence}#{to_sentence expected}"
         end
 
         def failure_message_for_should_not
           assert_ivars :@actual
-          "expected #{@actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"
+          "expected #{@actual.inspect} not to #{name_to_sentence}#{to_sentence expected}"
         end
 
         def description
@@ -56,7 +56,15 @@ module RSpec
           false
         end
 
-        private
+        # @api private
+        # Most matchers are value matchers (i.e. meant to work with `expect(value)`)
+        # rather than block matchers (i.e. meant to work with `expect { }`), so
+        # this defaults to false. Block matchers must override this to return true.
+        def supports_block_expectations?
+          false
+        end
+
+      private
 
         def assert_ivars *ivars
           raise "#{self.class.name} needs to supply #{to_sentence ivars}" unless ivars.all? { |v| instance_variables.map(&:intern).include? v }

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

@@ -149,13 +149,17 @@ it is a bit confusing.
           end
 
           begin
-            return @result = actual.__send__(predicate, *@args, &@block)
+            @result = actual.__send__(predicate, *@args, &@block)
+            check_respond_to(predicate)
+            return @result
           rescue NameError => predicate_missing_error
             "this needs to be here or rcov will not count this branch even though it's executed in a code example"
           end
 
           begin
-            return @result = actual.__send__(present_tense_predicate, *@args, &@block)
+            @result = actual.__send__(present_tense_predicate, *@args, &@block)
+            check_respond_to(present_tense_predicate)
+            return @result
           rescue NameError
             raise predicate_missing_error
           end
@@ -175,10 +179,10 @@ it is a bit confusing.
           "#{prefix_to_sentence}#{expected_to_sentence}#{args_to_sentence}"
         end
 
-        private
+      private
 
         # support 1.8.7
-        if methods.first.is_a? String
+        if String === methods.first
           def is_private_on? actual
             actual.private_methods.include? predicate.to_s
           end
@@ -209,6 +213,13 @@ it is a bit confusing.
         def prefix_to_sentence
           split_words(@prefix)
         end
+
+        def check_respond_to(method)
+          RSpec.deprecate(
+            "Matching with #{@prefix}#{@expected} on an object that doesn't respond to `#{method}`",
+            :replacement => "`respond_to_missing?` or `respond_to?` on your object"
+          ) unless actual.respond_to?(method)
+        end
       end
     end
   end

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

@@ -41,7 +41,12 @@ module RSpec
           "be within #{@delta}#{@unit} of #{@expected}"
         end
 
-        private
+        # @private
+        def supports_block_expectations?
+          false
+        end
+
+      private
 
         def needs_subtractable
           ArgumentError.new "The actual value (#{@actual.inspect}) must respond to `-`"

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

@@ -40,7 +40,6 @@ module RSpec
 
           unless matches_before?
             RSpec.warn_deprecation(<<-EOS.gsub(/^\s+\|/, ''))
-              |--------------------------------------------------------------------
               |The semantics of `expect { }.not_to change { }.from()` are changing
               |in RSpec 3. In RSpec 2.x, this would pass if the value changed but
               |the starting value was not what you specified with `from()`. In
@@ -49,7 +48,6 @@ module RSpec
               |
               |You have an expectation that relies upon the old RSpec 2.x semantics
               |at: #{CallerFilter.first_non_rspec_line}"
-              |--------------------------------------------------------------------
             EOS
           end
 
@@ -126,6 +124,10 @@ MESSAGE
           "change ##{message}"
         end
 
+        def supports_block_expectations?
+          true
+        end
+
         private
 
         def failure_message_for_expected_after

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

@@ -9,25 +9,50 @@ module RSpec
         end
 
         def matches?(actual)
-          actual.__send__(predicate(@expected), *@args)
+          method = predicate
+
+          if is_private_on?(actual)
+            RSpec.deprecate "matching with #{@expected} on private method #{predicate}",
+              :replacement => "`expect(object.send(#{predicate.inspect})).to be_true` or change the method's visibility to public"
+          end
+
+          result = actual.__send__(method, *@args)
+          check_respond_to(actual, method)
+          result
         end
 
         def failure_message_for_should
-          "expected ##{predicate(@expected)}#{failure_message_args_description} to return true, got false"
+          "expected ##{predicate}#{failure_message_args_description} to return true, got false"
         end
 
         def failure_message_for_should_not
-          "expected ##{predicate(@expected)}#{failure_message_args_description} to return false, got true"
+          "expected ##{predicate}#{failure_message_args_description} to return false, got true"
         end
 
         def description
           [method_description(@expected), args_description].compact.join(' ')
         end
 
-        private
+        # @private
+        def supports_block_expectations?
+          false
+        end
+
+      private
 
-        def predicate(sym)
-          "#{sym.to_s.sub("have_","has_")}?".to_sym
+        # support 1.8.7
+        if String === methods.first
+          def is_private_on? actual
+            actual.private_methods.include? predicate.to_s
+          end
+        else
+          def is_private_on? actual
+            actual.private_methods.include? predicate
+          end
+        end
+
+        def predicate
+          "#{@expected.to_s.sub("have_","has_")}?".to_sym
         end
 
         def method_description(method)
@@ -43,6 +68,13 @@ module RSpec
           desc = args_description
           "(#{desc})" if desc
         end
+
+        def check_respond_to(actual, method)
+          RSpec.deprecate(
+            "Matching with #{@expected} on an object that doesn't respond to `#{method}`",
+            :replacement => "`respond_to_missing?` or `respond_to?` on your object"
+          ) unless actual.respond_to?(method)
+        end
       end
     end
   end

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

@@ -17,7 +17,7 @@ module RSpec
         end
 
         def description
-          "include#{expected_to_sentence}"
+          "include#{to_sentence expected}"
         end
 
         def diffable?

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

@@ -27,7 +27,7 @@ module RSpec
         end
 
         def description
-          "contain exactly #{_pretty_print(expected)}"
+          "contain exactly#{to_sentence(expected)}"
         end
 
         private

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

@@ -91,6 +91,11 @@ module RSpec
           "raise #{expected_error}"
         end
 
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
         private
 
         def expected_error

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

@@ -39,6 +39,11 @@ module RSpec
         end
         alias :arguments :argument
 
+        # @private
+        def supports_block_expectations?
+          false
+        end
+
         private
 
         def find_failing_method_names(actual, filter_method)

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

@@ -25,6 +25,11 @@ module RSpec
         def description
           "satisfy block"
         end
+
+        # @private
+        def supports_block_expectations?
+          false
+        end
       end
     end
   end

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

@@ -66,7 +66,14 @@ module RSpec
           "throw #{expected}"
         end
 
-        private
+        # @api private
+        # Indicates this matcher matches against a block.
+        # @return [True]
+        def supports_block_expectations?
+          true
+        end
+
+      private
 
         def expected(symbol_desc = 'a Symbol')
           throw_description(@expected_symbol || symbol_desc, @expected_arg)

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

@@ -121,7 +121,12 @@ module RSpec
           end
         end
 
-        private
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
+      private
 
         def set_expected_yields_count(relativity, n)
           @expectation_type = relativity
@@ -169,6 +174,11 @@ module RSpec
           "expected given block not to yield with no arguments, but did"
         end
 
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
       private
 
         def failure_reason
@@ -207,6 +217,11 @@ module RSpec
           desc
         end
 
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
       private
 
         def positive_failure_reason
@@ -282,6 +297,11 @@ module RSpec
           desc
         end
 
+        # @private
+        def supports_block_expectations?
+          true
+        end
+
       private
 
         def args_match?

data/lib/rspec/matchers/dsl.rb

@@ -7,7 +7,8 @@ module RSpec
         matcher_template = RSpec::Matchers::DSL::Matcher.new(name, &declarations)
         define_method name do |*expected|
           matcher = matcher_template.for_expected(*expected)
-          matcher.matcher_execution_context = @matcher_execution_context ||= self
+          @matcher_execution_context ||= self
+          matcher.instance_variable_set(:@matcher_execution_context, @matcher_execution_context)
           matcher
         end
       end

data/lib/rspec/matchers/matcher.rb

@@ -12,7 +12,6 @@ module RSpec
         include RSpec::Matchers
 
         attr_reader :actual, :rescued_exception
-        attr_accessor :matcher_execution_context
 
         # @api private
         def initialize(name, &declarations)
@@ -20,16 +19,19 @@ module RSpec
           @declarations = declarations
           @actual       = nil
           @diffable     = false
+          @supports_block_expectations = false
           @expected_exception, @rescued_exception = nil, nil
           @match_for_should_not_block = nil
           @messages = {}
           @define_block_executed = false
           @block_method_differentiator = nil
           @deprecated_methods = Set.new
+          @matcher_execution_context = nil
         end
 
         PERSISTENT_INSTANCE_VARIABLES = [
           :@name, :@declarations, :@diffable,
+          :@supports_block_expectations,
           :@match_block, :@match_for_should_not_block,
           :@expected_exception
         ].to_set
@@ -51,6 +53,16 @@ module RSpec
           @expected
         end
 
+        def matcher_execution_context=(value)
+          RSpec.deprecate("`matcher_execution_context=` on custom matchers")
+          @matcher_execution_context = value
+        end
+
+        def matcher_execution_context
+          RSpec.deprecate("`matcher_execution_context` on custom matchers")
+          @matcher_execution_context
+        end
+
         # @api private
         def for_expected(*expected)
           @expected = expected
@@ -209,6 +221,10 @@ module RSpec
           @diffable = true
         end
 
+        def supports_block_expectations
+          @supports_block_expectations = true
+        end
+
         # Convenience for defining methods on this matcher to create a fluent
         # interface. The trick about fluent interfaces is that each method must
         # return self in order to chain methods together. `chain` handles that
@@ -240,6 +256,11 @@ module RSpec
           @diffable
         end
 
+        # @api private
+        def supports_block_expectations?
+          @supports_block_expectations
+        end
+
         # @api private
         # Used internally by +should_not+
         def does_not_match?(actual)
@@ -250,14 +271,14 @@ module RSpec
         end
 
         def respond_to?(method, include_private=false)
-          super || matcher_execution_context.respond_to?(method, include_private)
+          super || @matcher_execution_context.respond_to?(method, include_private)
         end
 
         private
 
         def method_missing(method, *args, &block)
-          if matcher_execution_context.respond_to?(method)
-            matcher_execution_context.__send__ method, *args, &block
+          if @matcher_execution_context.respond_to?(method)
+            @matcher_execution_context.__send__ method, *args, &block
           else
             super(method, *args, &block)
           end
@@ -334,15 +355,15 @@ module RSpec
         end
 
         def default_description
-          "#{name_to_sentence}#{expected_to_sentence}"
+          "#{name_to_sentence}#{to_sentence expected_as_array}"
         end
 
         def default_failure_message_for_should
-          "expected #{actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"
+          "expected #{actual.inspect} to #{name_to_sentence}#{to_sentence expected_as_array}"
         end
 
         def default_failure_message_for_should_not
-          "expected #{actual.inspect} not to #{name_to_sentence}#{expected_to_sentence}"
+          "expected #{actual.inspect} not to #{name_to_sentence}#{to_sentence expected_as_array}"
         end
 
         unless method_defined?(:singleton_class)