rspec-expectations 2.11.3 → 2.12.0

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

@@ -29,7 +29,9 @@ module RSpec
         def perform_match(predicate, hash_predicate, actuals, expecteds)
           expecteds.send(predicate) do |expected|
             if comparing_hash_values?(actuals, expected)
-              expected.send(hash_predicate) {|k,v| actuals[k] == v}
+              expected.send(hash_predicate) {|k,v|
+                actuals.has_key?(k) && actuals[k] == v
+              }
             elsif comparing_hash_keys?(actuals, expected)
               actuals.has_key?(expected)
             else

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

@@ -3,16 +3,22 @@ module RSpec
     module BuiltIn
       class MatchArray < BaseMatcher
         def match(expected, actual)
+          return false unless actual.respond_to? :to_ary
           @extra_items = difference_between_arrays(actual, expected)
           @missing_items = difference_between_arrays(expected, actual)
           @extra_items.empty? & @missing_items.empty?
         end
 
         def failure_message_for_should
-          message =  "expected collection contained:  #{safe_sort(expected).inspect}\n"
-          message += "actual collection contained:    #{safe_sort(actual).inspect}\n"
-          message += "the missing elements were:      #{safe_sort(@missing_items).inspect}\n" unless @missing_items.empty?
-          message += "the extra elements were:        #{safe_sort(@extra_items).inspect}\n"   unless @extra_items.empty?
+          if actual.respond_to? :to_ary
+            message =  "expected collection contained:  #{safe_sort(expected).inspect}\n"
+            message += "actual collection contained:    #{safe_sort(actual).inspect}\n"
+            message += "the missing elements were:      #{safe_sort(@missing_items).inspect}\n" unless @missing_items.empty?
+            message += "the extra elements were:        #{safe_sort(@extra_items).inspect}\n"   unless @extra_items.empty?
+          else
+            message = "expected an array, actual collection was #{actual.inspect}"
+          end
+
           message
         end
 
@@ -31,8 +37,8 @@ module RSpec
         end
 
         def difference_between_arrays(array_1, array_2)
-          difference = array_1.dup
-          array_2.each do |element|
+          difference = array_1.to_ary.dup
+          array_2.to_ary.each do |element|
             if index = difference.index(element)
               difference.delete_at(index)
             end

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

@@ -13,7 +13,7 @@ module RSpec
           end
         end
 
-        def matches?(given_proc)
+        def matches?(given_proc, negative_expectation = false)
           @raised_expected_error = false
           @with_expected_message = false
           @eval_block = false
@@ -29,7 +29,7 @@ module RSpec
             "http://eigenclass.org/hiki.rb?rcov-0.8.0"
           end
 
-          unless negative_expectation?
+          unless negative_expectation
             eval_block if @raised_expected_error && @with_expected_message && @block
           end
         ensure
@@ -37,6 +37,10 @@ module RSpec
         end
         alias == matches?
 
+        def does_not_match?(given_proc)
+          !matches?(given_proc, :negative_expectation)
+        end
+
         def eval_block
           @eval_block = true
           begin
@@ -83,13 +87,19 @@ module RSpec
           end
         end
 
-        def given_error
-          @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}"
+        def format_backtrace(backtrace)
+          formatter = Matchers.configuration.backtrace_formatter
+          formatter.format_backtrace(backtrace)
         end
 
-        def negative_expectation?
-          # YES - I'm a bad person... help me find a better way - ryand
-          caller.first(3).find { |s| s =~ /should_not/ }
+        def given_error
+          return " but nothing was raised" unless @actual_error
+
+          backtrace = format_backtrace(@actual_error.backtrace)
+          [
+            ", got #{@actual_error.inspect} with backtrace:",
+            *backtrace
+          ].join("\n  # ")
         end
       end
     end

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

@@ -83,7 +83,7 @@ module RSpec
 
         def matches?(block)
           @probe = YieldProbe.probe(block)
-          @probe.yielded_once?(:yield_with_no_args) && @probe.single_yield_args.none?
+          @probe.yielded_once?(:yield_with_no_args) && @probe.single_yield_args.empty?
         end
 
         def failure_message_for_should
@@ -127,7 +127,7 @@ module RSpec
 
         def description
           desc = "yield with args"
-          desc << "(" + @expected.map { |e| e.inspect }.join(", ") + ")" if @expected.any?
+          desc << "(" + @expected.map { |e| e.inspect }.join(", ") + ")" unless @expected.empty?
           desc
         end
 
@@ -152,9 +152,9 @@ module RSpec
         end
 
         def args_match?
-          if @expected.none? # expect {...}.to yield_with_args
-            @positive_args_failure = "yielded with no arguments" if @actual.none?
-            return @actual.any?
+          if @expected.empty? # expect {...}.to yield_with_args
+            @positive_args_failure = "yielded with no arguments" if @actual.empty?
+            return !@actual.empty?
           end
 
           unless match = all_args_match?

data/lib/rspec/matchers/configuration.rb

@@ -39,6 +39,19 @@ module RSpec
         syntaxes
       end
 
+      # color config for expectations
+      # fallback if rspec core not available
+      if ::RSpec.respond_to?(:configuration)
+        def color?
+          ::RSpec.configuration.color_enabled?
+        end
+      else
+        attr_writer :color
+        def color?
+          @color
+        end
+      end
+
       # Adds `should` and `should_not` to the given classes
       # or modules. This can be used to ensure `should` works
       # properly on things like proxy objects (particular
@@ -51,6 +64,35 @@ module RSpec
           Expectations::Syntax.enable_should(mod)
         end
       end
+
+      # Sets or gets the backtrace formatter. The backtrace formatter should
+      # implement `#format_backtrace(Array<String>)`. This is used
+      # to format backtraces of errors handled by the `raise_error`
+      # matcher.
+      #
+      # If you are using rspec-core, rspec-core's backtrace formatting
+      # will be used (including respecting the presence or absence of
+      # the `--backtrace` option).
+      #
+      # @overload backtrace_formatter
+      #   @return [#format_backtrace] the backtrace formatter
+      # @overload backtrace_formatter=
+      #   @param value [#format_backtrace] sets the backtrace formatter
+      attr_writer :backtrace_formatter
+      def backtrace_formatter
+        @backtrace_formatter ||= if defined?(::RSpec::Core::BacktraceFormatter)
+          ::RSpec::Core::BacktraceFormatter
+        else
+          NullBacktraceFormatter
+        end
+      end
+
+      # @api private
+      NullBacktraceFormatter = Module.new do
+        def self.format_backtrace(backtrace)
+          backtrace
+        end
+      end
     end
 
     # The configuration object

data/lib/rspec/matchers/generated_descriptions.rb

@@ -13,9 +13,9 @@ module RSpec
       return nil if last_should.nil?
       "#{last_should.to_s.gsub('_',' ')} #{last_description}"
     end
-    
+
   private
-    
+
     def self.last_description
       last_matcher.respond_to?(:description) ? last_matcher.description : <<-MESSAGE
 When you call a matcher in an example without a String, like this:
@@ -33,4 +33,3 @@ MESSAGE
     end
   end
 end
-      

data/spec/rspec/expectations/differ_spec.rb

@@ -4,8 +4,14 @@ require 'ostruct'
 module RSpec
   module Expectations
     describe Differ do
+      context "without --color" do
+
+      before { RSpec::Matchers.configuration.stub(:color? => false) }
+
       let(:differ) { RSpec::Expectations::Differ.new }
 
+        # color disabled context
+
       describe '#diff_as_string' do
         it "outputs unified diff of two strings" do
           expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
@@ -149,5 +155,23 @@ EOD
         end
       end
     end
+
+    context "with --color" do
+      before { RSpec::Matchers.configuration.stub(:color? => true) }
+
+      let(:differ) { RSpec::Expectations::Differ.new }
+
+      it "outputs colored diffs" do
+        expected = "foo bar baz"
+        actual = "foo bang baz"
+        expected_diff = "\n\e[34m@@ -1,2 +1,2 @@\n\e[0m\e[31m-foo bang baz\n\e[0m\e[32m+foo bar baz\n\e[0m"
+
+
+        diff = differ.diff_as_string(expected,actual)
+        diff.should == expected_diff
+      end
+    end
+
+    end
   end
 end

data/spec/rspec/expectations/handler_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module ExampleExpectations
-  
+
   class ArbitraryMatcher
     def initialize(*args, &block)
       if args.last.is_a? Hash
@@ -10,38 +10,38 @@ module ExampleExpectations
       @expected = block.call if block
       @block = block
     end
-    
+
     def matches?(target)
       @target = target
       return @expected == target
     end
-    
+
     def with(new_value)
       @expected = new_value
       self
     end
-    
+
     def failure_message
       "expected #{@expected}, got #{@target}"
     end
-    
+
     def negative_failure_message
       "expected not #{@expected}, got #{@target}"
     end
   end
-  
+
   class PositiveOnlyMatcher < ArbitraryMatcher
     undef negative_failure_message rescue nil
   end
-  
+
   def arbitrary_matcher(*args, &block)
     ArbitraryMatcher.new(*args, &block)
   end
-  
+
   def positive_only_matcher(*args, &block)
     PositiveOnlyMatcher.new(*args, &block)
   end
-  
+
 end
 
 module RSpec
@@ -54,23 +54,23 @@ module RSpec
           matcher.should_receive(:matches?).with(actual).and_return(true)
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
-      
+
         it "returns the match value" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(:this_value)
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher).should == :this_value
         end
-        
+
         it "calls failure_message_for_should if the matcher implements it" do
           matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
-          
+
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
-        
+
         it "calls fail if matcher.diffable?" do
           matcher = mock("matcher",
             :diffable? => true,
@@ -80,28 +80,28 @@ module RSpec
             :actual   => 2
           )
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("message", 1, 2)
-          
+
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
-        
+
         it "calls failure_message if the matcher does not implement failure_message_for_should" do
           matcher = mock("matcher", :failure_message => "message", :matches? => false)
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
-          
+
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
-          
+
         end
-        
+
         it "appends the :or message in the options hash passed to should" do
           matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("custom")
-          
+
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher, "custom")
         end
       end
@@ -123,7 +123,7 @@ module RSpec
           matcher.should_receive(:matches?).with(actual).and_return(false)
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
-      
+
         it "returns the match value" do
           matcher = mock("matcher")
           actual = Object.new
@@ -132,28 +132,28 @@ module RSpec
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher).should be_false
         end
 
-        
+
         it "calls failure_message_for_should_not if the matcher implements it" do
           matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
-          
+
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
-          
+
         end
-        
+
         it "calls negative_failure_message if the matcher does not implement failure_message_for_should_not" do
           matcher = mock("matcher", :negative_failure_message => "message", :matches? => true)
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("message")
-          
+
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
-          
+
         end
 
-        
+
         it "calls fail if matcher.diffable?" do
           matcher = mock("matcher",
             :diffable? => true,
@@ -163,27 +163,27 @@ module RSpec
             :actual   => 2
           )
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("message", 1, 2)
-          
+
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "appends the :or message in the options hash passed to should" do
           matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
           actual = Object.new
-          
+
           ::RSpec::Expectations.should_receive(:fail_with).with("custom")
-          
+
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher, "custom")
         end
 
       end
     end
-    
+
     describe PositiveExpectationHandler do
       include ExampleExpectations
-      
+
       it "handles submitted args" do
         5.should arbitrary_matcher(:expected => 5)
         5.should arbitrary_matcher(:expected => "wrong").with(5)
@@ -200,7 +200,7 @@ module RSpec
         5.should arbitrary_matcher(:expected => 4) { 5 }
         5.should arbitrary_matcher(:expected => 4).with(5) { 3 }
       end
-  
+
     end
   end
 end