opal-rspec 0.8.0.alpha3 → 1.0.0.alpha1

data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be.rb

@@ -8,13 +8,13 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected: truthy value\n     got: #{actual.inspect}"
+          "expected: truthy value\n     got: #{actual_formatted}"
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          "expected: falsey value\n     got: #{actual.inspect}"
+          "expected: falsey value\n     got: #{actual_formatted}"
         end
 
       private
@@ -31,13 +31,13 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected: falsey value\n     got: #{actual.inspect}"
+          "expected: falsey value\n     got: #{actual_formatted}"
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          "expected: truthy value\n     got: #{actual.inspect}"
+          "expected: truthy value\n     got: #{actual_formatted}"
         end
 
       private
@@ -54,7 +54,7 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected: nil\n     got: #{actual.inspect}"
+          "expected: nil\n     got: #{actual_formatted}"
         end
 
         # @api private
@@ -83,15 +83,15 @@ module RSpec
         end
 
         def inspected_args
-          @args.map { |a| a.inspect }
+          @args.map { |a| RSpec::Support::ObjectFormatter.format(a) }
         end
 
         def expected_to_sentence
-          split_words(@expected)
+          EnglishPhrasing.split_words(@expected)
         end
 
         def args_to_sentence
-          to_sentence(@args)
+          EnglishPhrasing.list(@args)
         end
       end
 
@@ -108,13 +108,13 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected #{@actual.inspect} to evaluate to true"
+          "expected #{actual_formatted} to evaluate to true"
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          "expected #{@actual.inspect} to evaluate to false"
+          "expected #{actual_formatted} to evaluate to false"
         end
 
         [:==, :<, :<=, :>=, :>, :===, :=~].each do |operator|
@@ -137,25 +137,35 @@ module RSpec
         include BeHelpers
 
         def initialize(operand, operator)
-          @expected, @operator = operand, operator
+          @expected = operand
+          @operator = operator
           @args = []
         end
 
         def matches?(actual)
-          @actual = actual
-          @actual.__send__ @operator, @expected
+          perform_match(actual)
+        rescue ArgumentError, NoMethodError
+          false
+        end
+
+        def does_not_match?(actual)
+          !perform_match(actual)
+        rescue ArgumentError, NoMethodError
+          false
         end
 
         # @api private
         # @return [String]
         def failure_message
-          "expected: #{@operator} #{@expected.inspect}\n     got: #{@operator.to_s.gsub(/./, ' ')} #{@actual.inspect}"
+          "expected: #{@operator} #{expected_formatted}\n" \
+          "     got: #{@operator.to_s.gsub(/./, ' ')} #{actual_formatted}"
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          message = "`expect(#{@actual.inspect}).not_to be #{@operator} #{@expected.inspect}`"
+          message = "`expect(#{actual_formatted}).not_to " \
+                    "be #{@operator} #{expected_formatted}`"
           if [:<, :>, :<=, :>=].include?(@operator)
             message + " not only FAILED, it is a bit confusing."
           else
@@ -168,108 +178,12 @@ module RSpec
         def description
           "be #{@operator} #{expected_to_sentence}#{args_to_sentence}"
         end
-      end
-
-      # @api private
-      # Provides the implementation of `be_<predicate>`.
-      # Not intended to be instantiated directly.
-      class BePredicate < BaseMatcher
-        include BeHelpers
-
-        def initialize(*args, &block)
-          @expected = parse_expected(args.shift)
-          @args = args
-          @block = block
-        end
-
-        def matches?(actual, &block)
-          @actual  = actual
-          @block ||= block
-          predicate_accessible? && predicate_matches?
-        end
-
-        def does_not_match?(actual, &block)
-          @actual  = actual
-          @block ||= block
-          predicate_accessible? && !predicate_matches?
-        end
-
-        # @api private
-        # @return [String]
-        def failure_message
-          failure_message_expecting(true)
-        end
-
-        # @api private
-        # @return [String]
-        def failure_message_when_negated
-          failure_message_expecting(false)
-        end
-
-        # @api private
-        # @return [String]
-        def description
-          "#{prefix_to_sentence}#{expected_to_sentence}#{args_to_sentence}"
-        end
 
       private
 
-        def predicate_accessible?
-          !private_predicate? && predicate_exists?
-        end
-
-        # support 1.8.7, evaluate once at load time for performance
-        if String === methods.first
-          def private_predicate?
-            @actual.private_methods.include? predicate.to_s
-          end
-        else
-          def private_predicate?
-            @actual.private_methods.include? predicate
-          end
-        end
-
-        def predicate_exists?
-          actual.respond_to?(predicate) || actual.respond_to?(present_tense_predicate)
-        end
-
-        def predicate_matches?
-          method_name = actual.respond_to?(predicate) ? predicate : present_tense_predicate
-          @predicate_matches = actual.__send__(method_name, *@args, &@block)
-        end
-
-        def predicate
-          :"#{@expected}?"
-        end
-
-        def present_tense_predicate
-          :"#{@expected}s?"
-        end
-
-        def parse_expected(expected)
-          @prefix, expected = prefix_and_expected(expected)
-          expected
-        end
-
-        def prefix_and_expected(symbol)
-          Matchers::BE_PREDICATE_REGEX.match(symbol.to_s).captures.compact
-        end
-
-        def prefix_to_sentence
-          split_words(@prefix)
-        end
-
-        def failure_message_expecting(value)
-          validity_message ||
-            "expected `#{@actual.inspect}.#{predicate}#{args_to_s}` to return #{value}, got #{@predicate_matches.inspect}"
-        end
-
-        def validity_message
-          if private_predicate?
-            "expected #{@actual} to respond to `#{predicate}` but `#{predicate}` is a private method"
-          elsif !predicate_exists?
-            "expected #{@actual} to respond to `#{predicate}`"
-          end
+        def perform_match(actual)
+          @actual = actual
+          @actual.__send__ @operator, @expected
         end
       end
     end

data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_between.rb

@@ -55,7 +55,7 @@ module RSpec
         # @api private
         # @return [String]
         def description
-          "be between #{@min.inspect} and #{@max.inspect} (#{@mode})"
+          "be between #{description_of @min} and #{description_of @max} (#{@mode})"
         end
 
       private

data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_instance_of.rb

@@ -14,7 +14,11 @@ module RSpec
       private
 
         def match(expected, actual)
-          actual.instance_of? expected
+          actual.instance_of?(expected)
+        rescue NoMethodError
+          raise ::ArgumentError, "The #{matcher_name} matcher requires that " \
+                                 "the actual object responds to #instance_of? method " \
+                                 "but a `NoMethodError` was encountered instead."
         end
       end
     end

data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_kind_of.rb

@@ -8,7 +8,11 @@ module RSpec
       private
 
         def match(expected, actual)
-          actual.kind_of? expected
+          actual.kind_of?(expected)
+        rescue NoMethodError
+          raise ::ArgumentError, "The #{matcher_name} matcher requires that " \
+                                 "the actual object responds to #kind_of? method " \
+                                 "but a `NoMethodError` was encountered instead."
         end
       end
     end

data/rspec-expectations/upstream/lib/rspec/matchers/built_in/be_within.rb

@@ -23,7 +23,7 @@ module RSpec
         # a percent comparison.
         def percent_of(expected)
           @expected  = expected
-          @tolerance = @delta * @expected.abs / 100.0
+          @tolerance = @expected.abs * @delta / 100.0
           @unit      = '%'
           self
         end
@@ -38,19 +38,19 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected #{@actual.inspect} to #{description}#{not_numeric_clause}"
+          "expected #{actual_formatted} to #{description}#{not_numeric_clause}"
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          "expected #{@actual.inspect} not to #{description}"
+          "expected #{actual_formatted} not to #{description}"
         end
 
         # @api private
         # @return [String]
         def description
-          "be within #{@delta}#{@unit} of #{@expected}"
+          "be within #{@delta}#{@unit} of #{expected_formatted}"
         end
 
       private