rspec-mocks 2.8.0 → 2.9.0.rc2

data/.document

@@ -0,0 +1,5 @@
+README.markdown
+lib/**/*.rb
+bin/*
+features/**/*.feature
+License.txt

data/.yardopts

@@ -0,0 +1,7 @@
+--exclude features
+--no-private
+--markup markdown
+lib/**/*.rb
+-
+Changelog.md
+License.txt

data/Changelog.md

@@ -0,0 +1,147 @@
+### 2.9.0.rc2 / 2012-03-12
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0...v2.9.0.rc2)
+
+Enhancements
+
+* Support order constraints across objects (preethiramdev)
+
+Bug fixes
+
+* Allow a `as_null_object` to be passed to `with`
+* Pass proc to block passed to stub (Aubrey Rhodes)
+* Initialize child message expectation args to match any args (#109 -
+  preethiramdev)
+
+### 2.8.0 / 2012-01-04
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc2...v2.8.0)
+
+No changes for this release. Just releasing with the other rspec gems.
+
+### 2.8.0.rc2 / 2011-12-19
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.8.0.rc1...v2.8.0.rc2)
+
+No changes for this release. Just releasing with the other rspec gems.
+
+### 2.8.0.rc1 / 2011-11-06
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.7.0...v2.8.0.rc1)
+
+Enhancements
+
+* Eliminate Ruby warnings (Matijs van Zuijlen)
+
+### 2.7.0 / 2011-10-16
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.6.0...v2.7.0)
+
+Enhancements
+
+* Use `__send__` rather than `send` (alextk)
+* Add support for `any_instance.stub_chain` (Sidu Ponnappa)
+* Add support for `any_instance` argument matching based on `with` (Sidu
+  Ponnappa and Andy Lindeman)
+
+Changes
+
+* Check for `failure_message_for_should` or `failure_message` instead of
+  `description` to detect a matcher (Tibor Claassen)
+
+Bug fixes
+
+* pass a hash to `any_instance.stub`. (Justin Ko)
+* allow `to_ary` to be called without raising `NoMethodError` (Mikhail
+  Dieterle)
+* `any_instance` properly restores private methods (Sidu Ponnappa)
+
+### 2.6.0 / 2011-05-12
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.5.0...v2.6.0)
+
+Enhancements
+
+* Add support for `any_instance.stub` and `any_instance.should_receive` (Sidu
+  Ponnappa and Andy Lindeman)
+
+Bug fixes
+
+* fix bug in which multiple chains with shared messages ending in hashes failed
+  to return the correct value
+
+### 2.5.0 / 2011-02-05
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.4.0...v2.5.0)
+
+Bug fixes
+
+* message expectation counts now work in combination with a stub (Damian
+  Nurzynski)
+* fix failure message when message received with incorrect args (Josep M.
+  Bach)
+
+### 2.4.0 / 2011-01-02
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.3.0...v2.4.0)
+
+No functional changes in this release, which was made to align with the
+rspec-core-2.4.0 release.
+
+### 2.3.0 / 2010-12-12
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.2.0...v2.3.0)
+
+Bug fixes
+
+* Fix our Marshal extension so that it does not interfere with objects that
+  have their own `@mock_proxy` instance variable. (Myron Marston)
+
+### 2.2.0 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.1.0...v2.2.0)
+
+Enhancements
+
+* Added "rspec/mocks/standalone" for exploring the rspec-mocks in irb.
+
+Bug fix
+
+* Eliminate warning on splat args without parens (Gioele Barabucci)
+* Fix bug where `obj.should_receive(:foo).with(stub.as_null_object)` would pass
+  with a false positive.
+
+### 2.1.0 / 2010-11-07
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.1...v2.1.0)
+
+Bug fixes
+
+* Fix serialization of stubbed object (Josep M Bach)
+
+### 2.0.0 / 2010-10-10
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0)
+
+### 2.0.0.rc / 2010-10-05
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.22...v2.0.0.rc)
+
+Enhancements
+
+* support passing a block to an expectation block (Nicolas Braem)
+    * `obj.should_receive(:msg) {|&block| ... }`
+
+Bug fixes
+
+* Fix YAML serialization of stub (Myron Marston)
+* Fix rdoc rake task (Hans de Graaff)
+
+### 2.0.0.beta.22 / 2010-09-12
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0.beta.20...v2.0.0.beta.22)
+
+Bug fixes
+
+* fixed regression that broke `obj.stub_chain(:a, :b => :c)`
+* fixed regression that broke `obj.stub_chain(:a, :b) { :c }`
+* `respond_to?` always returns true when using `as_null_object`

data/features/method_stubs/as_null_object.feature

@@ -27,7 +27,6 @@ Feature: as_null_object
         end
 
         it "supports Array#flatten" do
-          null_object = double('foo')
           [null_object].flatten.should eq([null_object])
         end
       end

data/features/step_definitions/additional_cli_steps.rb

@@ -1,4 +1,4 @@
 Then /^the example(?:s)? should(?: all)? pass$/ do
-  Then %q{the output should contain "0 failures"}
-  Then %q{the exit status should be 0}
+  step %q{the output should contain "0 failures"}
+  step %q{the exit status should be 0}
 end

data/lib/rspec/mocks/argument_expectation.rb

@@ -3,13 +3,13 @@ module RSpec
     # @api private
     class ArgumentExpectation
       attr_reader :args
-      
+
       def initialize(*args, &block)
         @args = args
         @block = args.empty? ? block : nil
         @match_any_args = false
         @matchers = nil
-        
+
         case args.first
         when ArgumentMatchers::AnyArgsMatcher
           @match_any_args = true
@@ -19,34 +19,31 @@ module RSpec
           @matchers = args.collect {|arg| matcher_for(arg)}
         end
       end
-      
+
       def matcher_for(arg)
         return ArgumentMatchers::MatcherMatcher.new(arg) if is_matcher?(arg)
         return ArgumentMatchers::RegexpMatcher.new(arg)  if arg.is_a?(Regexp)
         return ArgumentMatchers::EqualityProxy.new(arg)
       end
-      
+
       def is_matcher?(obj)
-        !null_object?(obj) & obj.respond_to?(:matches?) & [:failure_message_for_should, :failure_message].any? { |m| obj.respond_to?(m) }
+        !obj.null_object? & obj.respond_to?(:matches?) & [:failure_message_for_should, :failure_message].any? { |m| obj.respond_to?(m) }
       end
 
       def args_match?(*args)
         match_any_args? || block_passes?(*args) || matchers_match?(*args)
       end
-      
+
       private
-      def null_object?(obj)
-        obj.respond_to?(:__rspec_double_acting_as_null_object?) && obj.__rspec_double_acting_as_null_object?
-      end
-      
+
       def block_passes?(*args)
         @block.call(*args) if @block
       end
-      
+
       def matchers_match?(*args)
         @matchers == args
       end
-      
+
       def match_any_args?
         @match_any_args
       end

data/lib/rspec/mocks/argument_matchers.rb

@@ -87,7 +87,7 @@ module RSpec
         end
 
         def ==(value)
-          @methods_to_respond_to.all? {|sym| value.respond_to?(sym)}
+          @methods_to_respond_to.all? {|message| value.respond_to?(message)}
         end
       end
 

data/lib/rspec/mocks/error_generator.rb

@@ -16,37 +16,37 @@ module RSpec
       end
 
       # @private
-      def raise_unexpected_message_error(sym, *args)
-        __raise "#{intro} received unexpected message :#{sym}#{arg_message(*args)}"
+      def raise_unexpected_message_error(message, *args)
+        __raise "#{intro} received unexpected message :#{message}#{arg_message(*args)}"
       end
 
       # @private
       def raise_unexpected_message_args_error(expectation, *args)
         expected_args = format_args(*expectation.expected_args)
         actual_args = format_args(*args)
-        __raise "#{intro} received #{expectation.sym.inspect} with unexpected arguments\n  expected: #{expected_args}\n       got: #{actual_args}"
+        __raise "#{intro} received #{expectation.message.inspect} with unexpected arguments\n  expected: #{expected_args}\n       got: #{actual_args}"
       end
 
       # @private
       def raise_similar_message_args_error(expectation, *args)
         expected_args = format_args(*expectation.expected_args)
         actual_args = args.collect {|a| format_args(*a)}.join(", ")
-        __raise "#{intro} received #{expectation.sym.inspect} with unexpected arguments\n  expected: #{expected_args}\n       got: #{actual_args}"
+        __raise "#{intro} received #{expectation.message.inspect} with unexpected arguments\n  expected: #{expected_args}\n       got: #{actual_args}"
       end
 
       # @private
-      def raise_expectation_error(sym, expected_received_count, actual_received_count, *args)
-        __raise "(#{intro}).#{sym}#{format_args(*args)}\n    expected: #{count_message(expected_received_count)}\n    received: #{count_message(actual_received_count)}"
+      def raise_expectation_error(message, expected_received_count, actual_received_count, *args)
+        __raise "(#{intro}).#{message}#{format_args(*args)}\n    expected: #{count_message(expected_received_count)}\n    received: #{count_message(actual_received_count)}"
       end
 
       # @private
-      def raise_out_of_order_error(sym)
-        __raise "#{intro} received :#{sym} out of order"
+      def raise_out_of_order_error(message)
+        __raise "#{intro} received :#{message} out of order"
       end
 
       # @private
-      def raise_block_failed_error(sym, detail)
-        __raise "#{intro} received :#{sym} but passed block failed with: #{detail}"
+      def raise_block_failed_error(message, detail)
+        __raise "#{intro} received :#{message} but passed block failed with: #{detail}"
       end
 
       # @private

data/lib/rspec/mocks/extensions/psych.rb

@@ -12,7 +12,7 @@ if defined?(Psych) && Psych.respond_to?(:dump)
         begin
           dump_without_mocks(object, *args)
         ensure
-          object.instance_variable_set(:@mock_proxy,mp)
+          object.instance_variable_set(:@mock_proxy, mp)
         end
       end
 

data/lib/rspec/mocks/message_expectation.rb

@@ -3,23 +3,23 @@ module RSpec
 
     class MessageExpectation
       # @private
-      attr_reader :sym
-      attr_writer :expected_received_count, :method_block, :expected_from
+      attr_reader :message
+      attr_writer :expected_received_count, :method_block, :expected_from, :argument_expectation
       protected :expected_received_count=, :method_block=, :expected_from=
       attr_accessor :error_generator
       protected :error_generator, :error_generator=
 
       # @private
-      def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={}, &implementation)
+      def initialize(error_generator, expectation_ordering, expected_from, message, method_block, expected_received_count=1, opts={}, &implementation)
         @error_generator = error_generator
         @error_generator.opts = opts
         @expected_from = expected_from
-        @sym = sym
+        @message = message
         @method_block = method_block
         @return_block = nil
         @actual_received_count = 0
         @expected_received_count = expected_received_count
-        @args_expectation = ArgumentExpectation.new(ArgumentMatchers::AnyArgsMatcher.new)
+        @argument_expectation = ArgumentExpectation.new(ArgumentMatchers::AnyArgsMatcher.new)
         @consecutive = false
         @exception_to_raise = nil
         @args_to_throw = []
@@ -45,12 +45,13 @@ module RSpec
         new_gen.opts = opts
         child.error_generator = new_gen
         child.clone_args_to_yield(*@args_to_yield)
+        child.argument_expectation = ArgumentExpectation.new(ArgumentMatchers::AnyArgsMatcher.new)
         child
       end
 
       # @private
       def expected_args
-        @args_expectation.args
+        @argument_expectation.args
       end
 
       # @overload and_return(value)
@@ -163,8 +164,8 @@ module RSpec
       end
 
       # @private
-      def matches?(sym, *args)
-        @sym == sym and @args_expectation.args_match?(*args)
+      def matches?(message, *args)
+        @message == message and @argument_expectation.args_match?(*args)
       end
 
       # @private
@@ -172,13 +173,20 @@ module RSpec
         if @expected_received_count == 0
           @failed_fast = true
           @actual_received_count += 1
-          @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *args)
+          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, *args)
         end
 
         @order_group.handle_order_constraint self
 
         begin
-          Kernel::raise(@exception_to_raise) unless @exception_to_raise.nil?
+          begin
+            raise(@exception_to_raise) unless @exception_to_raise.nil?
+          rescue ArgumentError => e
+            raise e.exception(<<-MESSAGE)
+'and_raise' can only accept an Exception class if an instance can be constructed with no arguments.
+#{@exception_to_raise.to_s}'s initialize method requires #{@exception_to_raise.instance_method(:initialize).arity} arguments, so you have to supply an instance instead.
+MESSAGE
+          end
           Kernel::throw(*@args_to_throw) unless @args_to_throw.empty?
 
           default_return_val = if !@method_block.nil?
@@ -208,8 +216,8 @@ module RSpec
       end
 
       # @private
-      def matches_name_but_not_args(sym, *args)
-        @sym == sym and not @args_expectation.args_match?(*args)
+      def matches_name_but_not_args(message, *args)
+        @message == message and not @argument_expectation.args_match?(*args)
       end
 
       # @private
@@ -258,12 +266,16 @@ module RSpec
       # @private
       def generate_error
         if similar_messages.empty?
-          @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args)
+          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, *@argument_expectation.args)
         else
           @error_generator.raise_similar_message_args_error(self, *@similar_messages)
         end
       end
 
+      def raise_out_of_order_error
+        @error_generator.raise_out_of_order_error @message
+      end
+
       # Constrains a stub or message expectation to invocations with specific
       # arguments.
       #
@@ -290,7 +302,7 @@ module RSpec
       #   # => passes
       def with(*args, &block)
         @return_block = block if block_given? unless args.empty?
-        @args_expectation = ArgumentExpectation.new(*args, &block)
+        @argument_expectation = ArgumentExpectation.new(*args, &block)
         self
       end
 
@@ -397,7 +409,7 @@ module RSpec
       end
 
       # @private
-      def negative_expectation_for?(sym)
+      def negative_expectation_for?(message)
         return false
       end
 
@@ -417,7 +429,7 @@ module RSpec
         begin
           @method_block.call(*args, &block)
         rescue => detail
-          @error_generator.raise_block_failed_error(@sym, detail.message)
+          @error_generator.raise_block_failed_error(@message, detail.message)
         end
       end
 
@@ -450,11 +462,7 @@ module RSpec
       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)
+        @return_block.arity == 0 ? @return_block.call(&block) : @return_block.call(*args, &block)
       end
 
       def clone_args_to_yield(*args)
@@ -468,15 +476,12 @@ module RSpec
 
       def set_expected_received_count(relativity, n)
         @at_least = (relativity == :at_least)
-        @at_most = (relativity == :at_most)
-        @exactly = (relativity == :exactly)
+        @at_most  = (relativity == :at_most)
+        @exactly  = (relativity == :exactly)
         @expected_received_count = case n
-                                   when Numeric
-                                     n
-                                   when :once
-                                     1
-                                   when :twice
-                                     2
+                                   when Numeric then n
+                                   when :once   then 1
+                                   when :twice  then 2
                                    end
       end
 
@@ -488,13 +493,13 @@ module RSpec
     # @private
     class NegativeMessageExpectation < MessageExpectation
       # @private
-      def initialize(message, expectation_ordering, expected_from, sym, method_block)
-        super(message, expectation_ordering, expected_from, sym, method_block, 0)
+      def initialize(error_generator, expectation_ordering, expected_from, message, method_block)
+        super(error_generator, expectation_ordering, expected_from, message, method_block, 0)
       end
 
       # @private
-      def negative_expectation_for?(sym)
-        return @sym == sym
+      def negative_expectation_for?(message)
+        return @message == message
       end
     end
   end

data/lib/rspec/mocks/methods.rb

@@ -97,17 +97,18 @@ module RSpec
       # are declared, they'll work as expected. If not, the receiver is
       # returned.
       def as_null_object
+        @_null_object = true
         __mock_proxy.as_null_object
       end
 
       # Returns true if this object has received `as_null_object`
       def null_object?
-        __mock_proxy.null_object?
+        defined?(@_null_object)
       end
 
       # @private
-      def received_message?(sym, *args, &block)
-        __mock_proxy.received_message?(sym.to_sym, *args, &block)
+      def received_message?(message, *args, &block)
+        __mock_proxy.received_message?(message, *args, &block)
       end
 
       # @private

data/lib/rspec/mocks/mock.rb

@@ -37,19 +37,19 @@ module RSpec
       alias_method :to_str, :to_s
 
       # @private
-      def respond_to?(sym, incl_private=false)
-        __mock_proxy.null_object? && sym != :to_ary ? true : super
+      def respond_to?(message, incl_private=false)
+        __mock_proxy.null_object? && message != :to_ary ? true : super
       end
 
     private
 
-      def method_missing(sym, *args, &block)
-          raise NoMethodError if sym == :to_ary
-        __mock_proxy.record_message_received(sym, *args, &block)
+      def method_missing(message, *args, &block)
+          raise NoMethodError if message == :to_ary
+        __mock_proxy.record_message_received(message, *args, &block)
         begin
           __mock_proxy.null_object? ? self : super
         rescue NameError
-          __mock_proxy.raise_unexpected_message_error(sym, *args)
+          __mock_proxy.raise_unexpected_message_error(message, *args)
         end
       end
 

data/lib/rspec/mocks/order_group.rb

@@ -2,8 +2,7 @@ module RSpec
   module Mocks
     # @private
     class OrderGroup
-      def initialize error_generator
-        @error_generator = error_generator
+      def initialize
         @ordering = Array.new
       end
 
@@ -14,7 +13,7 @@ module RSpec
 
       # @private
       def ready_for?(expectation)
-        return @ordering.first == expectation
+        @ordering.first == expectation
       end
 
       # @private
@@ -23,10 +22,18 @@ module RSpec
       end
 
       # @private
-      def handle_order_constraint expectation
-        return unless @ordering.include? expectation
+      def handle_order_constraint(expectation)
+        return unless @ordering.include?(expectation)
         return consume if ready_for?(expectation)
-        @error_generator.raise_out_of_order_error expectation.sym
+        expectation.raise_out_of_order_error
+      end
+
+      def clear
+        @ordering.clear
+      end
+
+      def empty?
+        @ordering.empty?
       end
     end
   end

data/lib/rspec/mocks/proxy.rb

@@ -33,8 +33,8 @@ module RSpec
         @object = object
         @name = name
         @error_generator = ErrorGenerator.new object, name, options
-        @expectation_ordering = OrderGroup.new @error_generator
-          @messages_received = []
+        @expectation_ordering = RSpec::Mocks::space.expectation_ordering
+        @messages_received = []
         @options = options
         @already_proxied_respond_to = false
         @null_object = false
@@ -101,38 +101,38 @@ module RSpec
       end
 
       # @private
-      def has_negative_expectation?(method_name)
-        method_double[method_name].expectations.detect {|expectation| expectation.negative_expectation_for?(method_name)}
+      def has_negative_expectation?(message)
+        method_double[message].expectations.detect {|expectation| expectation.negative_expectation_for?(message)}
       end
 
       # @private
-      def record_message_received(method_name, *args, &block)
-        @messages_received << [method_name, args, block]
+      def record_message_received(message, *args, &block)
+        @messages_received << [message, args, block]
       end
 
       # @private
-      def message_received(method_name, *args, &block)
-        expectation = find_matching_expectation(method_name, *args)
-        stub = find_matching_method_stub(method_name, *args)
+      def message_received(message, *args, &block)
+        expectation = find_matching_expectation(message, *args)
+        stub = find_matching_method_stub(message, *args)
 
         if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
           expectation.increase_actual_received_count! if expectation && expectation.actual_received_count_matters?
-          if expectation = find_almost_matching_expectation(method_name, *args)
+          if expectation = find_almost_matching_expectation(message, *args)
             expectation.advise(*args) unless expectation.expected_messages_received?
           end
           stub.invoke(*args, &block)
         elsif expectation
           expectation.invoke(*args, &block)
-        elsif expectation = find_almost_matching_expectation(method_name, *args)
+        elsif expectation = find_almost_matching_expectation(message, *args)
           expectation.advise(*args) if null_object? unless expectation.expected_messages_received?
-          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(method_name) or null_object?)
-        elsif stub = find_almost_matching_stub(method_name, *args)
+          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(message) or null_object?)
+        elsif stub = find_almost_matching_stub(message, *args)
           stub.advise(*args)
           raise_unexpected_message_args_error(stub, *args)
         elsif @object.is_a?(Class)
-          @object.superclass.__send__(method_name, *args, &block)
+          @object.superclass.__send__(message, *args, &block)
         else
-          @object.__send__(:method_missing, method_name, *args, &block)
+          @object.__send__(:method_missing, message, *args, &block)
         end
       end
 

data/lib/rspec/mocks/serialization.rb

@@ -8,6 +8,8 @@ module RSpec
       # @private
       def self.fix_for(object)
         object.extend(YAML) if defined?(::YAML)
+      rescue TypeError
+        # Can't extend Fixnums, Symbols, true, false, or nil
       end
 
       # @private

data/lib/rspec/mocks/space.rb

@@ -3,26 +3,31 @@ module RSpec
     # @api private
     class Space
       def add(obj)
-        mocks << obj unless mocks.detect {|m| m.equal? obj}
+        receivers << obj unless receivers.detect {|m| m.equal? obj}
       end
 
       def verify_all
-        mocks.each do |mock|
+        receivers.each do |mock|
           mock.rspec_verify
         end
       end
 
       def reset_all
-        mocks.each do |mock|
+        receivers.each do |mock|
           mock.rspec_reset
         end
-        mocks.clear
+        receivers.clear
+        expectation_ordering.clear
       end
-      
+
+      def expectation_ordering
+        @expectation_ordering ||= OrderGroup.new
+      end
+
     private
     
-      def mocks
-        @mocks ||= []
+      def receivers
+        @receivers ||= []
       end
     end
   end

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.8.0'
+      STRING = '2.9.0.rc2'
     end
   end
 end

data/spec/rspec/mocks/any_instance_spec.rb

@@ -769,14 +769,14 @@ module RSpec
 
         it "adds an class to the current space when #any_instance is invoked" do
           klass.any_instance
-          RSpec::Mocks::space.send(:mocks).should include(klass)
+          RSpec::Mocks::space.send(:receivers).should include(klass)
         end
 
         it "adds an instance to the current space when stubbed method is invoked" do
           klass.any_instance.stub(:foo)
           instance = klass.new
           instance.foo
-          RSpec::Mocks::space.send(:mocks).should include(instance)
+          RSpec::Mocks::space.send(:receivers).should include(instance)
         end
       end
 

data/spec/rspec/mocks/argument_expectation_spec.rb

@@ -3,20 +3,18 @@ require 'spec_helper'
 module RSpec
   module Mocks
     describe ArgumentExpectation do
-      
+
       it "considers an object that responds to #matches? and #failure_message_for_should to be a matcher" do
         argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
-        obj.stub(:respond_to?).with(:__rspec_double_acting_as_null_object?).and_return(false)
         obj.stub(:respond_to?).with(:matches?).and_return(true)
         obj.stub(:respond_to?).with(:failure_message_for_should).and_return(true)
         argument_expecatation.is_matcher?(obj).should be_true
       end
-      
+
       it "considers an object that responds to #matches? and #failure_message to be a matcher for backward compatibility" do
         argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
-        obj.stub(:respond_to?).with(:__rspec_double_acting_as_null_object?).and_return(false)
         obj.stub(:respond_to?).with(:matches?).and_return(true)
         obj.stub(:respond_to?).with(:failure_message_for_should).and_return(false)
         obj.stub(:respond_to?).with(:failure_message).and_return(true)
@@ -26,7 +24,6 @@ module RSpec
       it "does NOT consider an object that only responds to #matches? to be a matcher" do
         argument_expecatation = RSpec::Mocks::ArgumentExpectation.new
         obj = double("matcher")
-        obj.stub(:respond_to?).with(:__rspec_double_acting_as_null_object?).and_return(false)
         obj.stub(:respond_to?).with(:matches?).and_return(true)
         obj.stub(:respond_to?).with(:failure_message_for_should).and_return(false)
         obj.stub(:respond_to?).with(:failure_message).and_return(false)

data/spec/rspec/mocks/bug_report_11545_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 class LiarLiarPantsOnFire
-  def respond_to?(sym, incl_private=false)
+  def respond_to?(message, incl_private=false)
     true
   end
   
-  def self.respond_to?(sym, incl_private=false)
+  def self.respond_to?(message, incl_private=false)
     true
   end
 end

data/spec/rspec/mocks/bug_report_8165_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe "An object where respond_to? is true and does not have method" do
-  # When should_receive(:sym) is sent to any object, the Proxy sends
-  # respond_to?(:sym) to that object to see if the method should be proxied.
+  # When should_receive(message) is sent to any object, the Proxy sends
+  # respond_to?(message) to that object to see if the method should be proxied.
   #
   # If respond_to? itself is proxied, then when the Proxy sends respond_to?
   # to the object, the proxy is invoked and responds yes (if so set in the spec).
-  # When the object does NOT actually respond to :sym, an exception is thrown
+  # When the object does NOT actually respond to `message`, an exception is thrown
   # when trying to proxy it.
   #
-  # The fix was to keep track of whether :respond_to? had been proxied and, if
-  # so, call the munged copy of :respond_to? on the object.
+  # The fix was to keep track of whether `respond_to?` had been proxied and, if
+  # so, call the munged copy of `respond_to?` on the object.
 
   it "does not raise an exception for Object" do
     obj = Object.new

data/spec/rspec/mocks/mock_ordering_spec.rb

@@ -4,34 +4,30 @@ module RSpec
   module Mocks
 
     describe "ordering" do
+      before { @double = double("test double") }
+      after  { @double.rspec_reset }
 
-      before do
-        @double = double("test double")
-      end
-      
-      after do
-        @double.rspec_reset
-      end
-
-      it "passes two calls in order" do
-        @double.should_receive(:one).ordered
-        @double.should_receive(:two).ordered
-        @double.one
-        @double.two
-        @double.rspec_verify
-      end
-
-      it "passes three calls in order" do
+      it "passes when messages are received in order" do
         @double.should_receive(:one).ordered
         @double.should_receive(:two).ordered
         @double.should_receive(:three).ordered
         @double.one
         @double.two
         @double.three
-        @double.rspec_verify
       end
 
-      it "fails if second call comes first" do
+      it "passes when messages are received in order across objects" do
+        a = double("a")
+        b = double("b")
+        a.should_receive(:one).ordered
+        b.should_receive(:two).ordered
+        a.should_receive(:three).ordered
+        a.one
+        b.two
+        a.three
+      end
+
+      it "fails when messages are received out of order (2nd message 1st)" do
         @double.should_receive(:one).ordered
         @double.should_receive(:two).ordered
         lambda do
@@ -39,7 +35,7 @@ module RSpec
         end.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :two out of order")
       end
 
-      it "fails if third call comes first" do
+      it "fails when messages are received out of order (3rd message 1st)" do
         @double.should_receive(:one).ordered
         @double.should_receive(:two).ordered
         @double.should_receive(:three).ordered
@@ -48,8 +44,8 @@ module RSpec
           @double.three
         end.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :three out of order")
       end
-      
-      it "fails if third call comes second" do
+
+      it "fails when messages are received out of order (3rd message 2nd)" do
         @double.should_receive(:one).ordered
         @double.should_receive(:two).ordered
         @double.should_receive(:three).ordered
@@ -59,7 +55,21 @@ module RSpec
         end.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :three out of order")
       end
 
-      it "ignores order of non ordered calls" do
+      it "fails when messages are out of order across objects" do
+        a = double("test double")
+        b = double("another test double")
+        a.should_receive(:one).ordered
+        b.should_receive(:two).ordered
+        a.should_receive(:three).ordered
+        a.one
+        lambda do
+          a.three
+        end.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :three out of order")
+        a.rspec_reset
+        b.rspec_reset
+      end
+
+      it "ignores order of non ordered messages" do
         @double.should_receive(:ignored_0)
         @double.should_receive(:ordered_1).ordered
         @double.should_receive(:ignored_1)
@@ -78,17 +88,16 @@ module RSpec
         @double.ignored_1
         @double.rspec_verify
       end
-      
-      it "passes when duplicates exist" do
+
+      it "supports duplicate messages" do
         @double.should_receive(:a).ordered
         @double.should_receive(:b).ordered
         @double.should_receive(:a).ordered
-        
+
         @double.a
         @double.b
         @double.a
       end
-            
     end
   end
 end

data/spec/rspec/mocks/mock_space_spec.rb

@@ -40,7 +40,11 @@ module RSpec
       it "clears internal mocks on reset_all" do
         @space.add(double("mock"))
         @space.reset_all
-        @space.instance_eval { mocks.empty? }.should be_true
+        @space.instance_eval { receivers.empty? }.should be_true
+      end
+      it "resets the ordering" do
+        @space.reset_all
+        @space.expectation_ordering.should be_empty
       end
       it "only adds an instance once" do
         @space.add(m1 = double("mock1"))

data/spec/rspec/mocks/mock_spec.rb

@@ -8,7 +8,7 @@ module RSpec
       end
 
       treats_method_missing_as_private :subject => RSpec::Mocks::Mock.new, :noop => false
-      
+
       after(:each) do
         @mock.rspec_reset
       end
@@ -54,7 +54,7 @@ module RSpec
           @mock.not_expected
           violated
         }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Double "test double").not_expected(no args)\n    expected: 0 times\n    received: 1 time|
         )
       end
@@ -65,7 +65,7 @@ module RSpec
           @mock.not_expected("unexpected text")
           violated
         }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
+          RSpec::Mocks::MockExpectationError,
           %Q|(Double "test double").not_expected("unexpected text")\n    expected: 0 times\n    received: 1 time|
         )
       end
@@ -137,19 +137,19 @@ module RSpec
           @mock.rspec_verify
         }.should raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :something with unexpected arguments\n  expected: (\"a\", \"b\", \"c\")\n       got: (\"a\", \"d\", \"c\")")
       end
-      
+
       describe 'with a method that has a default argument' do
         it "raises an exception if the arguments don't match when the method is called, correctly reporting the offending arguments" do
           def @mock.method_with_default_argument(arg={}); end
           @mock.should_receive(:method_with_default_argument).with({})
-          
+
           expect {
             @mock.method_with_default_argument(nil)
             @mock.rspec_verify
           }.to raise_error(RSpec::Mocks::MockExpectationError, "Double \"test double\" received :method_with_default_argument with unexpected arguments\n  expected: ({})\n       got: (nil)")
         end
       end
-      
+
       it "fails if unexpected method called" do
         lambda {
           @mock.something("a","b","c")
@@ -174,41 +174,42 @@ module RSpec
         }.to raise_error(RSpec::Mocks::MockExpectationError, /Double \"test double\" received :something but passed block failed with: expected false to be true/)
       end
 
-      it "passes block to expectation block", :ruby => '> 1.8.6' do
-        a = nil
+      it "passes proc to expectation block without an argument", :ruby => '> 1.8.6' do
         # We eval this because Ruby 1.8.6's syntax parser barfs on { |&block| ... }
         # and prevents the entire spec suite from running.
-        eval("@mock.should_receive(:something) { |&block| a = block }")
-        b = lambda { }
-        @mock.something(&b)
-        a.should eq b
-        @mock.rspec_verify
+        eval("@mock.should_receive(:foo) {|&block| block.call.should eq(:bar)}")
+        @mock.foo { :bar }
       end
 
-      it "fails right away when method defined as never is received" do
-        @mock.should_receive(:not_expected).never
-        expect { @mock.not_expected }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
-          %Q|(Double "test double").not_expected(no args)\n    expected: 0 times\n    received: 1 time|
-        )
+      it "passes proc to expectation block with an argument", :ruby => '> 1.8.6' do
+        eval("@mock.should_receive(:foo) {|arg, &block| block.call.should eq(:bar)}")
+        @mock.foo(:arg) { :bar }
       end
 
-      it "eventually fails when method defined as never is received" do
+      it "passes proc to stub block without an argurment", :ruby => '>1.8.6' do
+        eval("@mock.stub(:foo) {|&block| block.call.should eq(:bar)}")
+        @mock.foo { :bar }
+      end
+
+      it "passes proc to stub block with an argument", :ruby => '> 1.8.6' do
+        eval("@mock.stub(:foo) {|arg, &block| block.call.should eq(:bar)}")
+        @mock.foo(:arg) { :bar }
+      end
+
+      it "fails right away when method defined as never is received" do
         @mock.should_receive(:not_expected).never
-        expect { @mock.not_expected }.to raise_error(
-          RSpec::Mocks::MockExpectationError, 
-          %Q|(Double "test double").not_expected(no args)\n    expected: 0 times\n    received: 1 time|
+        expect { @mock.not_expected }.
+          to raise_error(RSpec::Mocks::MockExpectationError,
+                         %Q|(Double "test double").not_expected(no args)\n    expected: 0 times\n    received: 1 time|
         )
       end
 
       it "raises when told to" do
         @mock.should_receive(:something).and_raise(RuntimeError)
-        lambda do
-          @mock.something
-        end.should raise_error(RuntimeError)
+        expect { @mock.something }.to raise_error(RuntimeError)
       end
 
-      it "raises passed an Exception instance" do
+      it "raises instance of submitted Exception" do
         error = RuntimeError.new("error message")
         @mock.should_receive(:something).and_raise(error)
         lambda {
@@ -216,7 +217,19 @@ module RSpec
         }.should raise_error(RuntimeError, "error message")
       end
 
-      it "raises RuntimeError with passed message" do
+      it "fails with helpful message if submitted Exception requires constructor arguments" do
+        class ErrorWithNonZeroArgConstructor < RuntimeError
+          def initialize(i_take_an_argument)
+          end
+        end
+
+        @mock.stub(:something).and_raise(ErrorWithNonZeroArgConstructor)
+        lambda {
+          @mock.something
+        }.should raise_error(ArgumentError, /^'and_raise' can only accept an Exception class if an instance/)
+      end
+
+      it "raises RuntimeError with submitted message" do
         @mock.should_receive(:something).and_raise("error message")
         lambda {
           @mock.something
@@ -615,7 +628,7 @@ module RSpec
         mock = double()
         expect {mock.foo}.to raise_error(/Double received/)
       end
-      
+
       it "does respond to initially stubbed methods" do
         double = double(:foo => "woo", :bar => "car")
         double.foo.should eq "woo"

data/spec/rspec/mocks/serialization_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'yaml'
 
 module RSpec
   module Mocks

data/spec/rspec/mocks/stubbed_message_expectations_spec.rb

@@ -1,26 +1,47 @@
 require 'spec_helper'
 
-module RSpec
-  module Mocks
-    describe "Example with stubbed and then called message" do
-      it "fails if the message is expected and then subsequently not called again" do
-        double = double("mock", :msg => nil)
-        double.msg
-        double.should_receive(:msg)
-        lambda { double.rspec_verify }.should raise_error(RSpec::Mocks::MockExpectationError)
-      end
+describe "expection set on previously stubbed method" do
+  it "fails if message is not received after expectation is set" do
+    double = double(:msg => nil)
+    double.msg
+    double.should_receive(:msg)
+    lambda { double.rspec_verify }.should raise_error(RSpec::Mocks::MockExpectationError)
+  end
+
+  it "outputs arguments of similar calls" do
+    double = double('double', :foo => true)
+    double.should_receive(:foo).with('first')
+    double.foo('second')
+    double.foo('third')
+    lambda do
+      double.rspec_verify
+    end.should raise_error(%Q|Double "double" received :foo with unexpected arguments\n  expected: ("first")\n       got: ("second"), ("third")|)
+    double.rspec_reset
+  end
+
+  context "with argument constraint on stub" do
+    it "matches any args if no arg constraint set on expectation" do
+      double = double("mock")
+      double.stub(:foo).with(3).and_return("stub")
+      double.should_receive(:foo).at_least(:once).and_return("expectation")
+      double.foo
+      double.rspec_verify
+    end
+
+    it "matches specific args set on expectation" do
+      double = double("mock")
+      double.stub(:foo).with(3).and_return("stub")
+      double.should_receive(:foo).at_least(:once).with(4).and_return("expectation")
+      double.foo(4)
+      double.rspec_verify
+    end
 
-      it "outputs arguments of all similar calls" do
-        double = double('double', :foo => true)
-        double.should_receive(:foo).with('first')
-        double.foo('second')
-        double.foo('third')
-        lambda do
-          double.rspec_verify
-        end.should raise_error(%Q|Double "double" received :foo with unexpected arguments\n  expected: ("first")\n       got: ("second"), ("third")|)
-        double.rspec_reset
-      end
+    it "fails if expectation's arg constraint is not met" do
+      double = double("mock")
+      double.stub(:foo).with(3).and_return("stub")
+      double.should_receive(:foo).at_least(:once).with(4).and_return("expectation")
+      double.foo(3)
+      expect { double.rspec_verify }.to raise_error(/expected: \(4\)\s+got: \(3\)/)
     end
-    
   end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  hash: 85566451
+  prerelease: 6
   segments: 
   - 2
-  - 8
+  - 9
   - 0
-  version: 2.8.0
+  - rc
+  - 2
+  version: 2.9.0.rc2
 platform: ruby
 authors: 
 - Steven Baker
@@ -16,18 +18,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
-dependencies: []
-
+date: 2012-03-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  prerelease: false
+  requirement: *id001
+  name: rake
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
+        version: 1.1.9
+  prerelease: false
+  requirement: *id002
+  name: cucumber
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 4
+        - 11
+        version: 0.4.11
+  prerelease: false
+  requirement: *id003
+  name: aruba
+  type: :development
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec-users@rubyforge.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- License.txt
+extra_rdoc_files: []
+
 files: 
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
@@ -54,8 +102,11 @@ files:
 - lib/rspec/mocks/standalone.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
-- License.txt
 - README.md
+- License.txt
+- Changelog.md
+- .yardopts
+- .document
 - features/README.markdown
 - features/Scope.md
 - features/Upgrade.md
@@ -144,19 +195,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.8.0
+summary: rspec-mocks-2.9.0.rc2
 test_files: 
 - features/README.markdown
 - features/Scope.md