rspec 1.2.7 → 1.2.8

data/History.rdoc

@@ -1,3 +1,22 @@
+=== Version 1.2.8 / 2008-07-16
+
+* enhancements
+  * better messages for should[_not] be_nil (Chad Humphries and Rob Sanheim)
+  * should and should_not accept optional custom message
+    (suggestion from Rob Sanheim)
+    * result.should be_nil, "expected result to be nil"
+  * added 'spec/stubs/cucumber' to plug RSpec's stubbing framework into
+    Cucumber scenarios.
+  * added unstub method to remove a stub mid-example (Scott Taylor). Closes
+    #853.
+  * add more readable diff when expected and actual are hashes (Ryan Bigg).
+    Closes #848.
+
+* bug fixes
+  * fixed --line option for ruby 1.9.1
+  * fix stub_chain conflict between two chains starting with the same message
+    (Mike Rohland). Closes #846.
+
 === Version 1.2.7 / 2009-06-22
 
 * enhancments

data/Manifest.txt

@@ -63,6 +63,7 @@ features/command_line/line_number_option_with_example_with_no_name.feature
 features/example_groups/example_group_with_should_methods.feature
 features/example_groups/implicit_docstrings.feature
 features/example_groups/nested_groups.feature
+features/expectations/customized_message.feature
 features/expectations/expect_change.feature
 features/expectations/expect_error.feature
 features/extensions/custom_example_group.feature
@@ -75,6 +76,7 @@ features/interop/test_case_with_should_methods.feature
 features/matchers/define_diffable_matcher.feature
 features/matchers/define_matcher.feature
 features/matchers/define_matcher_outside_rspec.feature
+features/matchers/define_matcher_with_fluent_interface.feature
 features/mock_framework_integration/use_flexmock.feature
 features/mock_framework_integration/use_mocha.feature
 features/mock_framework_integration/use_rr.feature
@@ -204,6 +206,7 @@ lib/spec/runner/line_number_query.rb
 lib/spec/runner/option_parser.rb
 lib/spec/runner/options.rb
 lib/spec/runner/reporter.rb
+lib/spec/stubs/cucumber.rb
 lib/spec/test/unit.rb
 lib/spec/version.rb
 resources/helpers/cmdline.rb
@@ -237,7 +240,7 @@ spec/spec/example/shared_example_group_spec.rb
 spec/spec/example/subclassing_example_group_spec.rb
 spec/spec/example/subject_spec.rb
 spec/spec/expectations/differs/default_spec.rb
-spec/spec/expectations/extensions/object_spec.rb
+spec/spec/expectations/extensions/kernel_spec.rb
 spec/spec/expectations/fail_with_spec.rb
 spec/spec/expectations/handler_spec.rb
 spec/spec/expectations/wrap_expectation_spec.rb
@@ -314,6 +317,7 @@ spec/spec/mocks/stub_implementation_spec.rb
 spec/spec/mocks/stub_spec.rb
 spec/spec/mocks/stubbed_message_expectations_spec.rb
 spec/spec/mocks/twice_counts_spec.rb
+spec/spec/mocks/unstub_spec.rb
 spec/spec/package/bin_spec_spec.rb
 spec/spec/rake/spectask_spec.rb
 spec/spec/runner/class_and_argument_parser_spec.rb

data/features/expectations/customized_message.feature

@@ -0,0 +1,54 @@
+Feature: customized message
+
+  In order to get the feedback I want
+  As an RSpec user
+  I want to customize the failure message per example
+  
+  Scenario: one additional method
+    Given a file named "node_spec.rb.rb" with:
+      """
+      class Node
+        def initialize(state=:waiting)
+          @state = state
+        end
+        def state
+          @state
+        end
+        def waiting?
+          @state == :waiting
+        end
+        def started?
+          @state == :started
+        end
+        def start
+          @state = :started
+        end
+      end
+      
+      describe "a new Node" do
+        it "should be waiting" do
+          node = Node.new(:started) #start w/ started to trigger failure
+          node.should be_waiting, "node.state: #{node.state} (first example)"
+        end
+        
+        it "should not be started" do
+          node = Node.new(:started) #start w/ started to trigger failure
+          node.should_not be_started, "node.state: #{node.state} (second example)"
+        end
+      end
+      
+      describe "node.start" do
+        it "should change the state" do
+          node = Node.new(:started) #start w/ started to trigger failure
+          lambda {node.start}.should change{node.state}, "expected a change"
+        end
+      end
+      
+      """
+    When I run "spec node_spec.rb.rb --format specdoc"
+    Then the stdout should match "3 examples, 3 failures"
+    And  the stdout should not match "to return true, got false"
+    And  the stdout should not match "to return false, got true"
+    And  the stdout should match "node.state: started (first example)"
+    And  the stdout should match "node.state: started (second example)"
+    And  the stdout should match "expected a change"

data/features/matchers/define_matcher_with_fluent_interface.feature

@@ -0,0 +1,27 @@
+Feature: define matcher
+
+  In order to express my domain clearly in my code examples
+  As an RSpec user
+  I want to define matchers with fluent interfaces
+  
+  Scenario: one additional method
+    Given a file named "between_spec.rb" with:
+      """
+      Spec::Matchers.define :be_bigger_than do |first|
+        def but_smaller_than(second)
+          @second = second
+          self
+        end
+        
+        match do |actual|
+          (actual > first) && (actual < @second)
+        end
+      end
+
+      describe 5 do
+        it { should be_bigger_than(4).but_smaller_than(6) }
+      end
+      """
+    When I run "spec between_spec.rb --format specdoc"
+    Then the stdout should match "1 example, 0 failures"
+    And  the stdout should match "should be bigger than 4"

data/lib/spec/example/example_group_methods.rb

@@ -226,10 +226,10 @@ module Spec
       def examples_to_run(run_options)
         return example_proxies unless examples_were_specified?(run_options)
         if run_options.line_number_requested?
-          if location =~ /:#{run_options.example_line}$/
+          if location =~ /:#{run_options.example_line}:?/
             example_proxies
           else
-            example_proxies.select {|proxy| proxy.location =~ /:#{run_options.example_line}$/}
+            example_proxies.select {|proxy| proxy.location =~ /:#{run_options.example_line}:?/}
           end
         else
           example_proxies.reject do |proxy|

data/lib/spec/example/subject.rb

@@ -79,8 +79,8 @@ module Spec
         #   describe Person do
         #     it { should be_eligible_to_vote }
         #   end
-        def should(matcher=nil)
-          self == subject ? self.__should_for_example_group__(matcher) : subject.should(matcher)
+        def should(matcher=nil, message=nil)
+          self == subject ? self.__should_for_example_group__(matcher) : subject.should(matcher,message)
         end
 
         # Just like +should+, +should_not+ delegates to the subject (implicit or
@@ -91,8 +91,8 @@ module Spec
         #   describe Person do
         #     it { should_not be_eligible_to_vote }
         #   end
-        def should_not(matcher=nil)
-          self == subject ? self.__should_not_for_example_group__(matcher) : subject.should_not(matcher)
+        def should_not(matcher=nil, message=nil)
+          self == subject ? self.__should_not_for_example_group__(matcher) : subject.should_not(matcher,message)
         end
       end
     end

data/lib/spec/expectations/extensions/kernel.rb

@@ -23,8 +23,8 @@ module Kernel
   #
   # NOTE that this does NOT support receiver.should != expected.
   # Instead, use receiver.should_not == expected
-  def should(matcher=nil, &block)
-    Spec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, &block)
+  def should(matcher=nil, message=nil, &block)
+    Spec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, message, &block)
   end
   
   # :call-seq:
@@ -46,7 +46,7 @@ module Kernel
   #     => Passes unless (receiver =~ regexp)
   #
   # See Spec::Matchers for more information about matchers
-  def should_not(matcher=nil, &block)
-    Spec::Expectations::NegativeExpectationHandler.handle_matcher(self, matcher, &block)
+  def should_not(matcher=nil, message=nil, &block)
+    Spec::Expectations::NegativeExpectationHandler.handle_matcher(self, matcher, message, &block)
   end
 end

data/lib/spec/expectations/fail_with.rb

@@ -31,9 +31,11 @@ NOTICE
         end
         unless (differ.nil? || expected.nil? || target.nil?)
           if expected.is_a?(String)
-            message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected)
+            message << "\n\n Diff:" << self.differ.diff_as_string(target.to_s, expected)
+          elsif expected.is_a?(Hash) && target.is_a?(Hash)
+            message << "\n\n Diff:" << self.differ.diff_as_hash(target, expected)
           elsif !target.is_a?(Proc)
-            message << "\nDiff:" << self.differ.diff_as_object(target, expected)
+            message << "\n\n Diff:" << self.differ.diff_as_object(target, expected)
           end
         end
         Kernel::raise(Spec::Expectations::ExpectationNotMetError.new(message))

data/lib/spec/expectations/handler.rb

@@ -3,7 +3,7 @@ module Spec
     class InvalidMatcherError < ArgumentError; end        
     
     class PositiveExpectationHandler        
-      def self.handle_matcher(actual, matcher, &block)
+      def self.handle_matcher(actual, matcher, message=nil, &block)
         ::Spec::Matchers.last_should = :should
         ::Spec::Matchers.last_matcher = matcher
         return ::Spec::Matchers::PositiveOperatorMatcher.new(actual) if matcher.nil?
@@ -11,9 +11,9 @@ module Spec
         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
+        message ||= matcher.respond_to?(:failure_message_for_should) ?
+                    matcher.failure_message_for_should :
+                    matcher.failure_message
         
         if matcher.respond_to?(:diffable?) && matcher.diffable?
           ::Spec::Expectations.fail_with message, matcher.expected.first, matcher.actual
@@ -24,7 +24,7 @@ module Spec
     end
 
     class NegativeExpectationHandler
-      def self.handle_matcher(actual, matcher, &block)
+      def self.handle_matcher(actual, matcher, message=nil, &block)
         ::Spec::Matchers.last_should = :should_not
         ::Spec::Matchers.last_matcher = matcher
         return ::Spec::Matchers::NegativeOperatorMatcher.new(actual) if matcher.nil?
@@ -34,9 +34,9 @@ module Spec
                 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
+        message ||= matcher.respond_to?(:failure_message_for_should_not) ?
+                    matcher.failure_message_for_should_not :
+                    matcher.negative_failure_message
 
         if matcher.respond_to?(:diffable?) && matcher.diffable?
           ::Spec::Expectations.fail_with message, matcher.expected.first, matcher.actual

data/lib/spec/matchers.rb

@@ -108,7 +108,7 @@ module Spec
   #
   # You can create such a matcher like so:
   #
-  #   Spec::Matchers.create :be_in_zone do |zone|
+  #   Spec::Matchers.define :be_in_zone do |zone|
   #     match do |player|
   #       player.in_zone?(zone)
   #     end
@@ -118,7 +118,7 @@ module Spec
   # with logical default messages for failures. You can override the failure
   # messages and the generated description as follows:
   #
-  #   Spec::Matchers.create :be_in_zone do |zone|
+  #   Spec::Matchers.define :be_in_zone do |zone|
   #     match do |player|
   #       player.in_zone?(zone)
   #     end
@@ -192,4 +192,4 @@ module Spec
   #   end
   #
   module Matchers; end
-end
+end

data/lib/spec/matchers/be.rb

@@ -30,14 +30,24 @@ module Spec
       end
       
       def failure_message_for_should
-        handling_predicate? ?
-          "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}" :
+        if handling_predicate?
+          if predicate == :nil?
+            "expected nil, got #{@actual.inspect}"
+          else
+            "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
+          end
+        else
           "expected #{@comparison_method} #{expected}, got #{@actual.inspect}".gsub('  ',' ')
+        end
       end
       
       def failure_message_for_should_not
         if handling_predicate?
+          if predicate == :nil?
+            "expected not nil, got nil"
+          else
           "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
+          end
         else
           message = <<-MESSAGE
 'should_not be #{@comparison_method} #{expected}' not only FAILED,

data/lib/spec/matchers/matcher.rb

@@ -6,8 +6,9 @@ module Spec
       attr_reader :expected, :actual
       
       def initialize(name, *expected, &declarations)
-        @name = name
+        @name     = name
         @expected = expected
+        @actual   = nil
         @diffable = false
         @messages = {
           :description => lambda {"#{name_to_sentence}#{expected_to_sentence}"},

data/lib/spec/mocks/message_expectation.rb

@@ -14,7 +14,6 @@ module Spec
         @expected_from = expected_from
         @sym = sym
         @method_block = method_block
-        @return_block = nil
         @actual_received_count = 0
         @expected_received_count = expected_received_count
         @args_expectation = ArgumentExpectation.new([ArgumentMatchers::AnyArgsMatcher.new])
@@ -94,7 +93,7 @@ module Spec
         @sym == sym and @args_expectation.args_match?(args)
       end
       
-      def invoke(args, block)
+      def invoke(*args, &block)
         if @expected_received_count == 0
           @failed_fast = true
           @actual_received_count += 1
@@ -109,17 +108,17 @@ module Spec
           
           
           if !@method_block.nil?
-            default_return_val = invoke_method_block(args)
+            default_return_val = invoke_method_block(*args)
           elsif @args_to_yield.size > 0
-            default_return_val = invoke_with_yield(block)
+            default_return_val = invoke_with_yield(&block)
           else
             default_return_val = nil
           end
           
           if @consecutive
-            return invoke_consecutive_return_block(args, block)
+            return invoke_consecutive_return_block(*args, &block)
           elsif @return_block
-            return invoke_return_block(args, block)
+            return invoke_return_block(*args, &block)
           else
             return default_return_val
           end
@@ -133,9 +132,17 @@ module Spec
           @actual_received_count >= @expected_received_count
       end
       
+      def invoke_return_block(*args, &block)
+        args << block unless block.nil?
+        # Ruby 1.9 - when we set @return_block to return values
+        # regardless of arguments, any arguments will result in
+        # a "wrong number of arguments" error
+        @return_block.arity == 0 ? @return_block.call : @return_block.call(*args)
+      end
+      
       protected
 
-      def invoke_method_block(args)
+      def invoke_method_block(*args)
         begin
           @method_block.call(*args)
         rescue => detail
@@ -143,7 +150,7 @@ module Spec
         end
       end
       
-      def invoke_with_yield(block)
+      def invoke_with_yield(&block)
         if block.nil?
           @error_generator.raise_missing_block_error @args_to_yield
         end
@@ -157,20 +164,12 @@ module Spec
         value
       end
       
-      def invoke_consecutive_return_block(args, block)
-        value = invoke_return_block(args, block)
+      def invoke_consecutive_return_block(*args, &block)
+        value = invoke_return_block(*args, &block)
         index = [@actual_received_count, value.size-1].min
         value[index]
       end
       
-      def invoke_return_block(args, block)
-        args << block unless block.nil?
-        # Ruby 1.9 - when we set @return_block to return values
-        # regardless of arguments, any arguments will result in
-        # a "wrong number of arguments" error
-        @return_block.arity == 0 ? @return_block.call : @return_block.call(*args)
-      end
-      
       def clone_args_to_yield(args)
         @args_to_yield = args.clone
         @args_to_yield_were_cloned = true
@@ -182,9 +181,13 @@ module Spec
     end
     
     class MessageExpectation < BaseExpectation
+
+      def matches_name?(sym)
+        @sym == sym
+      end
       
       def matches_name_but_not_args(sym, args)
-        @sym == sym and not @args_expectation.args_match?(args)
+        matches_name?(sym) and not @args_expectation.args_match?(args)
       end
        
       def verify_messages_received

data/lib/spec/mocks/methods.rb

@@ -19,11 +19,22 @@ module Spec
       
       alias_method :stub, :stub!
 
+      def unstub!(message)
+        __mock_proxy.remove_stub(message)
+      end
+
+      alias_method :unstub, :unstub!
+
       def stub_chain(*methods)
         if methods.length > 1
-          next_in_chain = Object.new
-          stub!(methods.shift) {next_in_chain}
-          next_in_chain.stub_chain(*methods)
+          if matching_stub = __mock_proxy.find_matching_method_stub(methods[0])
+            methods.shift
+            matching_stub.invoke_return_block.stub_chain(*methods)
+          else
+            next_in_chain = Object.new
+            stub!(methods.shift) {next_in_chain}
+            next_in_chain.stub_chain(*methods)
+          end
         else
           stub!(methods.shift)
         end

data/lib/spec/mocks/proxy.rb

@@ -61,6 +61,17 @@ module Spec
         @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts, &implementation)
         @stubs.first
       end
+
+      def remove_stub(message)
+        message = message.to_sym
+        
+        if stub_to_remove = @stubs.detect { |s| s.matches_name?(message) }
+          reset_proxied_method(message)
+          @stubs.delete(stub_to_remove)
+        else
+          raise MockExpectationError, "The method `#{message}` was not stubbed or was already unstubbed"
+        end
+      end
       
       def verify #:nodoc:
         verify_expectations
@@ -96,9 +107,9 @@ module Spec
           if expectation = find_almost_matching_expectation(sym, *args)
             expectation.advise(args, block) unless expectation.expected_messages_received?
           end
-          stub.invoke(args, block)
+          stub.invoke(*args, &block)
         elsif expectation
-          expectation.invoke(args, block)
+          expectation.invoke(*args, &block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
           expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
           raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
@@ -115,6 +126,10 @@ module Spec
         @error_generator.raise_unexpected_message_error sym, *args
       end
       
+      def find_matching_method_stub(sym, *args)
+        @stubs.find {|stub| stub.matches(sym, args)}
+      end
+      
     private
 
       def __add(sym)
@@ -193,13 +208,17 @@ module Spec
 
       def reset_proxied_methods
         @proxied_methods.each do |sym|
-          munged_sym = munge(sym)
-          target_metaclass.instance_eval do
-            remove_method sym
-            if method_defined?(munged_sym)
-              alias_method sym, munged_sym
-              remove_method munged_sym
-            end
+          reset_proxied_method(sym)
+        end
+      end
+
+      def reset_proxied_method(sym)
+        munged_sym = munge(sym)
+        target_metaclass.instance_eval do
+          remove_method sym
+          if method_defined?(munged_sym)
+            alias_method sym, munged_sym
+            remove_method munged_sym
           end
         end
       end
@@ -221,10 +240,6 @@ module Spec
         @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
       end
 
-      def find_matching_method_stub(sym, *args)
-        @stubs.find {|stub| stub.matches(sym, args)}
-      end
-
     end
   end
 end

data/lib/spec/runner/differs/default.rb

@@ -45,6 +45,37 @@ module Spec
           def diff_as_object(target,expected)
             diff_as_string(PP.pp(target,""), PP.pp(expected,""))
           end
+          
+          def diff_as_hash(target, expected)
+            contains_hash = false
+            contains_array = false
+            
+            extra_expected_keys = expected.keys - target.keys
+            extra_target_keys = target.keys - expected.keys
+            
+            o = "\n"
+            
+            o << "Expected hash contains keys that target hash does not: " << extra_expected_keys.inspect << "\n" if !extra_expected_keys.empty?
+            o << "Target hash contains keys that expected hash does not: " << extra_target_keys.inspect << "\n" if !extra_target_keys.empty?
+            
+            expected.delete_if do |key, value|
+              contains_hash = true if value.is_a?(Hash)
+              contains_array = true if value.is_a?(Array)
+              target[key]  == value
+            end
+            
+            expected.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key|
+              o << "Expected the key #{key.inspect} to be #{expected[key].inspect}, but was #{target[key].inspect}\n"
+            end
+            
+            o << "\n"
+
+            if contains_hash || contains_array
+              o << diff_as_object(target, expected)
+            else
+              o
+            end
+          end
 
           protected
           def format

data/lib/spec/stubs/cucumber.rb

@@ -0,0 +1,5 @@
+# This plugs RSpec's mocking/stubbing framework into cucumber
+require 'spec/mocks'
+Before {$rspec_stubs ||= Spec::Mocks::Space.new}
+After  {$rspec_stubs.reset_all}
+World(Spec::Mocks::ExampleMethods)

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 2
-      TINY   = 7
+      TINY   = 8
       PRE    = nil
       
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/autotest/autotest_matchers.rb

@@ -11,7 +11,7 @@ module Spec
       end
   
       def matches?(autotest)
-        @autotest = prepare autotest
+        @autotest = prepare(autotest)
         @actual = autotest.test_files_for(@file)
         @actual == @specs
       end
@@ -20,21 +20,12 @@ module Spec
         "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
       end
   
-      private
-      def prepare autotest
-        stub_found_files autotest
-        stub_find_order autotest
-        autotest
-      end
-  
-      def stub_found_files autotest
-        found_files = @specs.inject({}){|h,f| h[f] = Time.at(0)}
-        autotest.stub!(:find_files).and_return(found_files)
-      end
+    private
 
-      def stub_find_order autotest
+      def prepare(autotest)
         find_order = @specs.dup << @file
         autotest.instance_eval { @find_order = find_order }
+        autotest
       end
 
     end

data/spec/spec/example/example_group_methods_spec.rb

@@ -1,4 +1,4 @@
-  require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 module Spec
   module Example

data/spec/spec/expectations/differs/default_spec.rb

@@ -73,6 +73,60 @@ EOD
     diff = @differ.diff_as_object(expected,actual)
     diff.should == expected_diff
   end
+  
+  it "should output a friendly message if comparing simple hashes" do
+    expected = { "foo" => "bar" }
+    actual   = { "foo" => "baz" }
+    
+    expected_diff = <<'EOD'
+
+Expected the key "foo" to be "bar", but was "baz"
+
+EOD
+
+
+    diff = @differ.diff_as_hash(actual, expected)
+    diff.should == expected_diff
+  end
+  
+  
+  it "should output a friendly message if comparing simple hashes that contain different keys" do
+    expected = { "bar" => "foo" }
+    actual   = { "foo" => "baz" }
+
+    expected_diff = <<'EOD'
+
+Expected hash contains keys that target hash does not: ["bar"]
+Target hash contains keys that expected hash does not: ["foo"]
+Expected the key "bar" to be "foo", but was nil
+
+EOD
+
+
+    diff = @differ.diff_as_hash(actual, expected)
+    diff.should == expected_diff
+  end
+  
+  it "should output diff message if the hash is complex (containing Array or Hash)" do
+    expected = { "foo" => "bar", "fizz" => [1, 2, 3] }
+    actual   = { "foo" => "baz", "fizz" => [1, 2] }
+
+    expected_diff = <<'EOD'
+
+Expected the key "fizz" to be [1, 2, 3], but was [1, 2]
+Expected the key "foo" to be "bar", but was "baz"
+
+
+@@ -1,2 +1,2 @@
+-{"foo"=>"bar", "fizz"=>[1, 2, 3]}
++{"foo"=>"baz", "fizz"=>[1, 2]}
+EOD
+
+
+    diff = @differ.diff_as_hash(actual, expected)
+    diff.should == expected_diff
+  end
+  
 
   it "should output unified diff message of two objects" do
     expected = Spec::Fixtures::Animal.new "bob", "giraffe"

data/spec/spec/expectations/fail_with_spec.rb

@@ -47,19 +47,27 @@ describe Spec::Expectations, "#fail_with with diff" do
     @differ.should_receive(:diff_as_string).and_return("diff")
     lambda {
       Spec::Expectations.fail_with "the message", "expected", "actual"
-    }.should fail_with("the message\nDiff:diff")
+    }.should fail_with("the message\n\n Diff:diff")
   end
   
   it "should call differ if expected/actual are not strings" do
     @differ.should_receive(:diff_as_object).and_return("diff")
     lambda {
       Spec::Expectations.fail_with "the message", :expected, :actual
-    }.should fail_with("the message\nDiff:diff")
+    }.should fail_with("the message\n\n Diff:diff")
+  end
+  
+  it "should call differ if expected/actual are both hashes" do
+    @differ.should_receive(:diff_as_hash).and_return("diff")
+    lambda {
+      Spec::Expectations.fail_with "the message", {:a => :b}, {:a => 'b'}
+    }.should fail_with("the message\n\n Diff:diff")
   end
   
   it "should not call differ if expected or actual are procs" do
     @differ.should_not_receive(:diff_as_string)
     @differ.should_not_receive(:diff_as_object)
+    @differ.should_not_receive(:diff_as_hash)
     lambda {
       Spec::Expectations.fail_with "the message", lambda {}, lambda {}
     }.should fail_with("the message")

data/spec/spec/expectations/handler_spec.rb

@@ -95,6 +95,15 @@ module Spec
           Spec::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
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("custom")
+          
+          Spec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher, "custom")
+        end
       end
     end
 
@@ -160,6 +169,15 @@ module Spec
           Spec::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
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("custom")
+          
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher, "custom")
+        end
+
       end
     end
     

data/spec/spec/matchers/be_spec.rb

@@ -137,7 +137,7 @@ describe "should be_nil" do
   it "should fail when actual is not nil" do
     lambda {
       :not_nil.should be_nil
-    }.should fail_with("expected nil? to return true, got false")
+    }.should fail_with("expected nil, got :not_nil")
   end
 end
 
@@ -149,7 +149,7 @@ describe "should_not be_nil" do
   it "should fail when actual is nil" do
     lambda {
       nil.should_not be_nil
-    }.should fail_with("expected nil? to return false, got true")
+    }.should fail_with("expected not nil, got nil")
   end
 end
 

data/spec/spec/matchers/have_spec.rb

@@ -3,15 +3,17 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 share_as :HaveSpecHelper do
   def create_collection_owner_with(n)
     owner = Spec::Expectations::Helper::CollectionOwner.new
-    (1..n).each do |n|
-      owner.add_to_collection_with_length_method(n)
-      owner.add_to_collection_with_size_method(n)
+    (1..n).each do |number|
+      owner.add_to_collection_with_length_method(number)
+      owner.add_to_collection_with_size_method(number)
     end
     owner
   end
   before(:each) do
-    unless defined?(::ActiveSupport::Inflector)
-      @active_support_was_not_defined
+    if defined?(::ActiveSupport::Inflector)
+      @active_support_was_defined = true
+    else
+      @active_support_was_defined = false
       module ::ActiveSupport
         class Inflector
           def self.pluralize(string)
@@ -69,7 +71,7 @@ describe 'should have(1).item when ActiveSupport::Inflector is defined' do
   end
   
   after(:each) do
-    if @active_support_was_not_defined
+    unless @active_support_was_defined
       Object.__send__ :remove_const, :ActiveSupport
     end
   end
@@ -79,9 +81,11 @@ describe 'should have(1).item when Inflector is defined' do
   include HaveSpecHelper
   
   before(:each) do
-    unless defined?(Inflector)
-      @inflector_was_not_defined
-      class Inflector
+    if defined?(Inflector)
+      @inflector_was_defined = true
+    else
+      @inflector_was_defined = false
+      class ::Inflector
         def self.pluralize(string)
           string.to_s + 's'
         end
@@ -95,7 +99,7 @@ describe 'should have(1).item when Inflector is defined' do
   end
 
   after(:each) do
-    if @inflector_was_not_defined
+    unless @inflector_was_defined
       Object.__send__ :remove_const, :Inflector
     end
   end

data/spec/spec/mocks/stub_chain_spec.rb

@@ -22,13 +22,21 @@ module Spec
         @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
       end
 
-      it "returns expected value from chaining four method calls twice with some shared" do
+      it "returns expected value from two chains with shared messages at the end" do
         @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:first)
         @subject.stub_chain(:msg5, :msg2, :msg3, :msg4).and_return(:second)
 
         @subject.msg1.msg2.msg3.msg4.should equal(:first)
         @subject.msg5.msg2.msg3.msg4.should equal(:second)
       end
+
+      it "returns expected value from two chains with shared messages at the beginning" do
+        @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:first)
+        @subject.stub_chain(:msg1, :msg2, :msg3, :msg5).and_return(:second)
+
+        @subject.msg1.msg2.msg3.msg4.should equal(:first)
+        @subject.msg1.msg2.msg3.msg5.should equal(:second)
+      end
     end
   end
 end

data/spec/spec/mocks/unstub_spec.rb

@@ -0,0 +1,127 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Mocks
+    describe Mock do
+      context "unstubbing a mock object with a stub" do
+        it "should remove the stub" do
+          a_mock = mock 'an object', :foo => :bar
+
+          a_mock.unstub! :foo
+          a_mock.should_not respond_to(:foo)
+        end
+      end
+
+      context "unstubbing a real object with a stub" do
+        before do
+          @obj = Object.new
+        end
+
+        it "should raise a NoMethodError if the message is called after unstubbing" do
+          @obj.stub!(:foo).and_return :bar
+          @obj.unstub!(:foo)
+
+          lambda {
+            @obj.foo
+          }.should raise_error(NoMethodError)
+        end
+
+        it "should only clear the stub specified" do
+          @obj.stub!(:foo).and_return :bar
+          @obj.stub!(:other).and_return :baz
+
+          @obj.unstub!(:foo)
+
+          @obj.other.should == :baz
+        end
+
+        it "should no longer respond_to? the method" do
+          @obj.stub!(:foo).and_return :bar
+          @obj.unstub!(:foo)
+
+          @obj.should_not respond_to(:foo)
+        end
+
+        it "should unstub using a string (should convert the string to a symbol)" do
+          @obj.stub!(:foo)
+
+          @obj.unstub!("foo")
+
+          @obj.should_not respond_to(:foo)
+        end
+
+        it "should restore a previous method definition" do
+          def @obj.foo
+            :a_result
+          end
+
+          @obj.stub!(:foo).and_return :stubbed_result
+          @obj.unstub!(:foo)
+
+          @obj.foo.should == :a_result
+        end
+
+        it "should have unstub as an alias of unstub!" do
+          @obj.stub!(:foo).and_return :bar
+
+          @obj.unstub(:foo)
+
+          lambda {
+            @obj.foo
+          }.should raise_error(NoMethodError)
+        end
+
+        it "should raise a MockExpectationError if it is not stubbed" do
+          lambda {
+            @obj.unstub!(:foo)
+          }.should raise_error(MockExpectationError, "The method `foo` was not stubbed or was already unstubbed")
+        end
+
+        it "should raise a MockExpectationError if it was already unstubbed" do
+          @obj.stub!(:foo)
+          @obj.unstub!(:foo)
+
+          lambda {
+            @obj.unstub!(:foo)
+          }.should raise_error(MockExpectationError, "The method `foo` was not stubbed or was already unstubbed")
+        end
+
+        it "should use the correct message name in the error" do
+          @obj.stub!(:bar)
+          @obj.unstub!(:bar)
+
+          lambda {
+            @obj.unstub!(:bar)
+          }.should raise_error(MockExpectationError, "The method `bar` was not stubbed or was already unstubbed")
+        end
+
+        it "should raise a MockExpectationError if the method is defined, but not stubbed" do
+          def @obj.meth; end
+
+          lambda {
+            @obj.unstub!(:meth)
+          }.should raise_error(MockExpectationError)
+        end
+
+        it "should be able to restub a after unstubbing" do
+          @obj.stub!(:foo).and_return :bar
+
+          @obj.unstub!(:foo)
+
+          @obj.stub!(:foo).and_return :baz
+
+          @obj.foo.should == :baz
+        end
+
+        it "should remove only the first stub if multiple stubs have been defined" do
+          @obj.stub!(:foo).and_return :first
+          @obj.stub!(:foo).and_return :second
+
+          @obj.unstub!(:foo)
+
+          @obj.foo.should == :first
+        end
+      end
+    end
+  end
+end

data/spec/spec/runner/formatter/html_formatted-1.8.4.html

@@ -255,7 +255,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behavior driven development

data/spec/spec/runner/formatter/html_formatted-1.8.5.html

@@ -259,7 +259,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behavior driven development

data/spec/spec/runner/formatter/html_formatted-1.8.6.html

@@ -265,7 +265,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behaviour driven development

data/spec/spec/runner/formatter/html_formatted-1.8.7.html

@@ -265,7 +265,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behaviour driven development

data/spec/spec/runner/formatter/html_formatted-1.9.1.html

@@ -270,7 +270,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behaviour driven development

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+# require File.dirname(__FILE__) + '/../../../spec_helper'
 
 begin # See rescue all the way at the bottom
 

data/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html

@@ -255,7 +255,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behavior driven development

data/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html

@@ -261,7 +261,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behaviour driven development

data/spec/spec/runner/formatter/text_mate_formatted-1.8.7.html

@@ -261,7 +261,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behaviour driven development

data/spec/spec/runner/formatter/text_mate_formatted-1.9.1.html

@@ -266,7 +266,8 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
 -behaviour driven development

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -05:00
+date: 2009-07-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.3.1
     version: 
 description: Behaviour Driven Development for Ruby.
 email: 
@@ -111,6 +111,7 @@ files:
 - features/example_groups/example_group_with_should_methods.feature
 - features/example_groups/implicit_docstrings.feature
 - features/example_groups/nested_groups.feature
+- features/expectations/customized_message.feature
 - features/expectations/expect_change.feature
 - features/expectations/expect_error.feature
 - features/extensions/custom_example_group.feature
@@ -123,6 +124,7 @@ files:
 - features/matchers/define_diffable_matcher.feature
 - features/matchers/define_matcher.feature
 - features/matchers/define_matcher_outside_rspec.feature
+- features/matchers/define_matcher_with_fluent_interface.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
@@ -252,6 +254,7 @@ files:
 - lib/spec/runner/option_parser.rb
 - lib/spec/runner/options.rb
 - lib/spec/runner/reporter.rb
+- lib/spec/stubs/cucumber.rb
 - lib/spec/test/unit.rb
 - lib/spec/version.rb
 - resources/helpers/cmdline.rb
@@ -285,7 +288,7 @@ files:
 - spec/spec/example/subclassing_example_group_spec.rb
 - spec/spec/example/subject_spec.rb
 - spec/spec/expectations/differs/default_spec.rb
-- spec/spec/expectations/extensions/object_spec.rb
+- spec/spec/expectations/extensions/kernel_spec.rb
 - spec/spec/expectations/fail_with_spec.rb
 - spec/spec/expectations/handler_spec.rb
 - spec/spec/expectations/wrap_expectation_spec.rb
@@ -362,6 +365,7 @@ files:
 - spec/spec/mocks/stub_spec.rb
 - spec/spec/mocks/stubbed_message_expectations_spec.rb
 - spec/spec/mocks/twice_counts_spec.rb
+- spec/spec/mocks/unstub_spec.rb
 - spec/spec/package/bin_spec_spec.rb
 - spec/spec/rake/spectask_spec.rb
 - spec/spec/runner/class_and_argument_parser_spec.rb
@@ -425,7 +429,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-1.2.7
+    Thank you for installing rspec-1.2.8
   
     Please be sure to read History.rdoc and Upgrade.rdoc
     for useful information about this release.
@@ -455,6 +459,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
-summary: rspec 1.2.7
+summary: rspec 1.2.8
 test_files: []