rspec-expectations 2.11.3 → 2.12.0

data/features/built_in_matchers/throw_symbol.feature

@@ -16,7 +16,7 @@ Feature: throw_symbol matcher
 
   Scenario: basic usage
     Given a file named "throw_symbol_matcher_spec.rb" with:
-      """
+      """ruby
       describe "throw" do
         specify { expect { throw :foo    }.to     throw_symbol }
         specify { expect { throw :bar, 7 }.to     throw_symbol }
@@ -37,7 +37,7 @@ Feature: throw_symbol matcher
 
   Scenario: specify thrown symbol
     Given a file named "throw_symbol_matcher_spec.rb" with:
-      """
+      """ruby
       describe "throw symbol" do
         specify { expect { throw :foo    }.to     throw_symbol(:foo) }
         specify { expect { throw :foo, 7 }.to     throw_symbol(:foo) }
@@ -61,7 +61,7 @@ Feature: throw_symbol matcher
 
   Scenario: specify thrown symbol and argument
     Given a file named "throw_symbol_argument_matcher_spec.rb" with:
-      """
+      """ruby
       describe "throw symbol with argument" do
         specify { expect { throw :foo, 7 }.to     throw_symbol(:foo, 7) }
         specify { expect { throw :foo, 8 }.to_not throw_symbol(:foo, 7) }

data/features/built_in_matchers/types.feature

@@ -17,7 +17,7 @@ Feature: specify types of objects
 
   Scenario: be_(a_)kind_of matcher
     Given a file named "be_kind_of_matcher_spec.rb" with:
-      """
+      """ruby
       module MyModule; end
 
       class Fixnum
@@ -70,7 +70,7 @@ Feature: specify types of objects
 
   Scenario: be_(an_)instance_of matcher
     Given a file named "be_instance_of_matcher_spec.rb" with:
-      """
+      """ruby
       module MyModule; end
 
       class Fixnum

data/features/built_in_matchers/yield.feature

@@ -24,7 +24,7 @@ Feature: yield matchers
 
   Background:
     Given a file named "my_class.rb" with:
-      """
+      """ruby
       class MyClass
         def self.yield_once_with(*args)
           yield *args
@@ -41,7 +41,7 @@ Feature: yield matchers
 
   Scenario: yield_control matcher
     Given a file named "yield_control_spec.rb" with:
-      """
+      """ruby
       require './my_class'
 
       describe "yield_control matcher" do
@@ -61,7 +61,7 @@ Feature: yield matchers
 
   Scenario: yield_with_args matcher
     Given a file named "yield_with_args_spec.rb" with:
-      """
+      """ruby
       require './my_class'
 
       describe "yield_with_args matcher" do
@@ -94,7 +94,7 @@ Feature: yield matchers
 
   Scenario: yield_with_no_args matcher
     Given a file named "yield_with_no_args_spec.rb" with:
-      """
+      """ruby
       require './my_class'
 
       describe "yield_with_no_args matcher" do
@@ -117,7 +117,7 @@ Feature: yield matchers
 
   Scenario: yield_successive_args matcher
     Given a file named "yield_successive_args_spec.rb" with:
-      """
+      """ruby
       def array
         [1, 2, 3]
       end

data/features/custom_matchers/access_running_example.feature

@@ -11,7 +11,7 @@ Feature: access running example
 
   Scenario: call method defined on example from matcher
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec::Matchers.define :bar do
         match do |_|
           foo == "foo"
@@ -33,7 +33,7 @@ Feature: access running example
 
   Scenario: call method _not_ defined on example from matcher
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec::Matchers.define :bar do
         match do |_|
           foo == "foo"
@@ -48,6 +48,6 @@ Feature: access running example
       """
     When I run `rspec ./example_spec.rb`
     Then the output should contain "1 example, 1 failure"
-    And the output should contain "undefined local variable"
+    And the output should match /undefined.*method/
     And the output should contain "RSpec::Matchers::DSL::Matcher"
     And the output should not contain "ExampleGroup"

data/features/custom_matchers/define_diffable_matcher.feature

@@ -7,7 +7,7 @@ Feature: define diffable matcher
   @wip
   Scenario: define a diffable matcher
     Given a file named "diffable_matcher_spec.rb" with:
-      """
+      """ruby
       RSpec::Matchers.define :be_just_like do |expected|
         match do |actual|
           actual == expected

data/features/custom_matchers/define_matcher.feature

@@ -6,7 +6,7 @@ Feature: define matcher
 
   Scenario: define a matcher with default messages
     Given a file named "matcher_with_default_message_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :be_a_multiple_of do |expected|
@@ -48,7 +48,7 @@ Feature: define matcher
 
   Scenario: overriding the failure_message_for_should
     Given a file named "matcher_with_failure_message_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :be_a_multiple_of do |expected|
@@ -72,7 +72,7 @@ Feature: define matcher
 
   Scenario: overriding the failure_message_for_should_not
     Given a file named "matcher_with_failure_for_message_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :be_a_multiple_of do |expected|
@@ -96,7 +96,7 @@ Feature: define matcher
 
   Scenario: overriding the description
     Given a file named "matcher_overriding_description_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :be_a_multiple_of do |expected|
@@ -124,7 +124,7 @@ Feature: define matcher
 
   Scenario: with no args
     Given a file named "matcher_with_no_args_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :have_7_fingers do
@@ -148,7 +148,7 @@ Feature: define matcher
 
   Scenario: with multiple args
     Given a file named "matcher_with_multiple_args_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :be_the_sum_of do |a,b,c,d|
@@ -168,7 +168,7 @@ Feature: define matcher
 
   Scenario: with helper methods
     Given a file named "matcher_with_internal_helper_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       RSpec::Matchers.define :have_same_elements_as do |sample|
@@ -193,7 +193,7 @@ Feature: define matcher
 
   Scenario: scoped in a module
     Given a file named "scoped_matcher_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       module MyHelpers
@@ -225,7 +225,7 @@ Feature: define matcher
 
   Scenario: scoped in an example group
     Given a file named "scoped_matcher_spec.rb" with:
-      """
+      """ruby
       require 'rspec/expectations'
 
       describe "group with matcher" do
@@ -259,7 +259,7 @@ Feature: define matcher
 
   Scenario: matcher with separate logic for should and should_not
     Given a file named "matcher_with_separate_should_not_logic_spec.rb" with:
-      """
+      """ruby
       RSpec::Matchers.define :contain do |*expected|
         match_for_should do |actual|
           expected.all? { |e| actual.include?(e) }
@@ -287,7 +287,7 @@ Feature: define matcher
 
   Scenario: use define_method to create a helper method with access to matcher params
     Given a file named "define_method_spec.rb" with:
-      """
+      """ruby
       RSpec::Matchers.define :be_a_multiple_of do |expected|
         define_method :is_multiple? do |actual|
           actual % expected == 0
@@ -312,7 +312,7 @@ Feature: define matcher
 
   Scenario: include a module with helper methods in the matcher
     Given a file named "include_module_spec.rb" with:
-      """
+      """ruby
       module MatcherHelpers
         def is_multiple?(actual, expected)
           actual % expected == 0

data/features/custom_matchers/define_matcher_outside_rspec.feature

@@ -6,7 +6,7 @@ Feature: define matcher outside rspec
 
   Scenario: define a matcher with default messages
     Given a file named "test_multiples.rb" with:
-      """
+      """ruby
       require "rspec/expectations"
       require "test/unit"
       

data/features/custom_matchers/define_matcher_with_fluent_interface.feature

@@ -4,7 +4,7 @@ Feature: define matcher with fluent interface
   
   Scenario: chained method with argumetn
     Given a file named "between_spec.rb" with:
-      """
+      """ruby
       RSpec::Matchers.define :be_bigger_than do |first|
         match do |actual|
           (actual > first) && (actual < @second)

data/features/customized_message.feature

@@ -6,7 +6,7 @@ Feature: customized message
   
   Scenario: customize failure message
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe Array do
         context "when created with `new`" do
           it "is empty" do

data/features/diffing.feature

@@ -4,7 +4,7 @@ Feature: diffing
 
   Scenario: diff for a multiline string
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe "a multiline string" do
         it "is like another string" do
           expected = <<-EXPECTED
@@ -34,7 +34,7 @@ Feature: diffing
 
   Scenario: diff for a multiline string and a regexp
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe "a multiline string" do
         it "is like another string" do
           expected = /expected/m
@@ -60,7 +60,7 @@ Feature: diffing
 
   Scenario: no diff for a single line strings
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe "a single line string" do
         it "is like another string" do
           expected = "this string"
@@ -74,7 +74,7 @@ Feature: diffing
 
   Scenario: no diff for numbers
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe "a number" do
         it "is like another number" do
           1.should eq(2)

data/features/implicit_docstrings.feature

@@ -6,7 +6,7 @@ Feature: implicit docstrings
 
   Scenario: run passing examples
     Given a file named "implicit_docstrings_spec.rb" with:
-    """
+    """ruby
     describe "Examples with no docstrings generate their own:" do
 
       specify { 3.should be < 5 }
@@ -26,7 +26,7 @@ Feature: implicit docstrings
 
   Scenario: run failing examples
     Given a file named "failing_implicit_docstrings_spec.rb" with:
-    """
+    """ruby
     describe "Failing examples with no descriptions" do
 
       # description is auto-generated as "should equal(5)" based on the last #should

data/features/test_frameworks/test_unit.feature

@@ -7,7 +7,7 @@ Feature: Test::Unit integration
 
   Scenario: Basic Test::Unit usage
     Given a file named "rspec_expectations_test.rb" with:
-      """
+      """ruby
       require 'test/unit'
       require 'rspec/expectations'
 

data/lib/rspec/expectations/differ.rb

@@ -36,6 +36,7 @@ module RSpec
         end
         #Handle the last remaining hunk
         output << oldhunk.diff(format) << "\n"
+        color_diff output
       end
 
       def diff_as_object(actual, expected)
@@ -48,7 +49,7 @@ module RSpec
           "between #{actual} and #{expected} is empty. Check the " \
           "implementation of #{actual}.==."
         else
-          diff
+          color_diff diff
         end
       end
 
@@ -62,6 +63,39 @@ module RSpec
         3
       end
 
+      def color(text, color_code)
+        "\e[#{color_code}m#{text}\e[0m"
+      end
+
+      def red(text)
+        color(text, 31)
+      end
+
+      def green(text)
+        color(text, 32)
+      end
+
+      def blue(text)
+        color(text, 34)
+      end
+
+      def color_diff(diff)
+        return diff unless RSpec::Matchers.configuration.color?
+
+        diff.lines.map { |line|
+          case line[0].chr
+          when "+"
+            green line
+          when "-"
+            red line
+          when "@"
+            line[1].chr == "@" ? blue(line) : line
+          else
+            line
+          end
+        }.join
+      end
+
       def object_to_string(object)
         case object
         when Hash

data/lib/rspec/expectations/handler.rb

@@ -1,18 +1,32 @@
 module RSpec
   module Expectations
-    class PositiveExpectationHandler        
+
+    class ExpectationHandler
+      def self.message_must_be_string(msg)
+        "WARNING: ignoring the provided expectation message argument " +
+        "(#{msg.inspect}) since it is not a string."
+      end
+
+      def self.check_message(msg)
+        ::Kernel.warn message_must_be_string(msg) unless msg.nil? || msg.is_a?(String)
+      end
+    end
+
+    class PositiveExpectationHandler < ExpectationHandler
+
       def self.handle_matcher(actual, matcher, message=nil, &block)
+        check_message(message)
         ::RSpec::Matchers.last_should = :should
         ::RSpec::Matchers.last_matcher = matcher
         return ::RSpec::Matchers::BuiltIn::PositiveOperatorMatcher.new(actual) if matcher.nil?
 
         match = matcher.matches?(actual, &block)
         return match if match
-        
+
         message ||= matcher.respond_to?(:failure_message_for_should) ?
                     matcher.failure_message_for_should :
                     matcher.failure_message
-        
+
         if matcher.respond_to?(:diffable?) && matcher.diffable?
           ::RSpec::Expectations.fail_with message, matcher.expected, matcher.actual
         else
@@ -21,17 +35,18 @@ module RSpec
       end
     end
 
-    class NegativeExpectationHandler
+    class NegativeExpectationHandler < ExpectationHandler
       def self.handle_matcher(actual, matcher, message=nil, &block)
+        check_message(message)
         ::RSpec::Matchers.last_should = :should_not
         ::RSpec::Matchers.last_matcher = matcher
         return ::RSpec::Matchers::BuiltIn::NegativeOperatorMatcher.new(actual) if matcher.nil?
-        
+
         match = matcher.respond_to?(:does_not_match?) ?
                 !matcher.does_not_match?(actual, &block) :
                 matcher.matches?(actual, &block)
         return match unless match
-        
+
         message ||= matcher.respond_to?(:failure_message_for_should_not) ?
                     matcher.failure_message_for_should_not :
                     matcher.negative_failure_message

data/lib/rspec/expectations/version.rb

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

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

@@ -5,6 +5,10 @@ module RSpec
         def match(expected, actual)
           actual.instance_of? expected
         end
+
+        def description
+          "be an instance of #{expected}"
+        end
       end
     end
   end