rspec-mocks 2.10.0 → 2.11.0

data/lib/rspec/mocks/argument_matchers.rb

@@ -7,6 +7,8 @@ module RSpec
     #
     # With the exception of `any_args` and `no_args`, they all match against
     # the arg in same position in the argument list.
+    #
+    # @see ArgumentListMatcher
     module ArgumentMatchers
 
       class AnyArgsMatcher
@@ -64,7 +66,7 @@ module RSpec
           "hash_including(#{@expected.inspect.sub(/^\{/,"").sub(/\}$/,"")})"
         end
       end
-      
+
       class HashExcludingMatcher
         def initialize(expected)
           @expected = expected
@@ -80,7 +82,7 @@ module RSpec
           "hash_not_including(#{@expected.inspect.sub(/^\{/,"").sub(/\}$/,"")})"
         end
       end
-      
+
       class DuckTypeMatcher
         def initialize(*methods_to_respond_to)
           @methods_to_respond_to = methods_to_respond_to
@@ -110,47 +112,47 @@ module RSpec
           @given == expected
         end
       end
-      
+
       class InstanceOf
         def initialize(klass)
           @klass = klass
         end
-        
+
         def ==(actual)
           actual.instance_of?(@klass)
         end
       end
-      
+
       class KindOf
         def initialize(klass)
           @klass = klass
         end
-        
+
         def ==(actual)
           actual.kind_of?(@klass)
         end
       end
 
-      # Passes if object receives `:message` with any args at all. This is
-      # really a more explicit variation of `object.should_receive(:message)`
+      # Matches any args at all. Supports a more explicit variation of
+      # `object.should_receive(:message)`
       #
       # @example
       #
-      #   object.should_receive(:message).with(any_args())
+      #   object.should_receive(:message).with(any_args)
       def any_args
         AnyArgsMatcher.new
       end
-      
-      # Passes as long as there is an argument.
+
+      # Matches any argument at all.
       #
       # @example
       #
-      #   object.should_receive(:message).with(anything())
+      #   object.should_receive(:message).with(anything)
       def anything
         AnyArgMatcher.new(nil)
       end
-      
-      # Passes if no arguments are passed along with the message
+
+      # Matches no arguments.
       #
       # @example
       #
@@ -158,8 +160,8 @@ module RSpec
       def no_args
         NoArgsMatcher.new
       end
-      
-      # Passes if the argument responds to the specified messages.
+
+      # Matches if the actual argument responds to the specified messages.
       #
       # @example
       #
@@ -169,7 +171,7 @@ module RSpec
         DuckTypeMatcher.new(*args)
       end
 
-      # Passes if the argument is boolean.
+      # Matches a boolean value.
       #
       # @example
       #
@@ -177,9 +179,9 @@ module RSpec
       def boolean
         BooleanMatcher.new(nil)
       end
-      
-      # Passes if the argument is a hash that includes the specified key(s) or
-      # key/value pairs. If the hash includes other keys, it will still pass.
+
+      # Matches a hash that includes the specified key(s) or key/value pairs.
+      # Ignores any additional keys.
       #
       # @example
       #
@@ -189,9 +191,8 @@ module RSpec
       def hash_including(*args)
         HashIncludingMatcher.new(anythingize_lonely_keys(*args))
       end
-      
-      # Passes if the argument is a hash that doesn't include the specified
-      # key(s) or key/value
+
+      # Matches a hash that doesn't include the specified key(s) or key/value.
       #
       # @example
       #
@@ -203,23 +204,30 @@ module RSpec
       end
 
       alias_method :hash_not_including, :hash_excluding
-      
-      # Passes if `arg.instance_of?(klass)`
+
+      # Matches if `arg.instance_of?(klass)`
+      #
+      # @example
+      #
+      #   object.should_receive(:message).with(instance_of(Thing))
       def instance_of(klass)
         InstanceOf.new(klass)
       end
-      
+
       alias_method :an_instance_of, :instance_of
-      
-      # Passes if `arg.kind_of?(klass)`
+
+      # Matches if `arg.kind_of?(klass)`
+      # @example
+      #
+      #   object.should_receive(:message).with(kind_of(Thing))
       def kind_of(klass)
         KindOf.new(klass)
       end
-      
+
       alias_method :a_kind_of, :kind_of
-      
+
       private
-      
+
       def anythingize_lonely_keys(*args)
         hash = args.last.class == Hash ? args.delete_at(-1) : {}
         args.each { | arg | hash[arg] = anything }

data/lib/rspec/mocks/error_generator.rb

@@ -27,6 +27,13 @@ module RSpec
         __raise "#{intro} received #{expectation.message.inspect} with unexpected arguments\n  expected: #{expected_args}\n       got: #{actual_args}"
       end
 
+      # @private
+      def raise_missing_default_stub_error(expectation,*args)
+        expected_args = format_args(*expectation.expected_args)
+        actual_args = args.collect {|a| format_args(*a)}.join(", ")
+        __raise "#{intro} received #{expectation.message.inspect} with unexpected arguments\n Please stub a default value first if message might be received with other args as well. \n"
+      end
+
       # @private
       def raise_similar_message_args_error(expectation, *args)
         expected_args = format_args(*expectation.expected_args)

data/lib/rspec/mocks/example_methods.rb

@@ -41,6 +41,47 @@ module RSpec
         Proxy.allow_message_expectations_on_nil
       end
 
+      # Stubs the named constant with the given value.
+      # Like method stubs, the constant will be restored
+      # to its original value (or lack of one, if it was
+      # undefined) when the example completes.
+      #
+      # @param constant_name [String] The fully qualified name of the constant. The current
+      #   constant scoping at the point of call is not considered.
+      # @param value [Object] The value to make the constant refer to. When the
+      #   example completes, the constant will be restored to its prior state.
+      # @param options [Hash] Stubbing options.
+      # @option options :transfer_nested_constants [Boolean, Array<Symbol>] Determines
+      #   what nested constants, if any, will be transferred from the original value
+      #   of the constant to the new value of the constant. This only works if both
+      #   the original and new values are modules (or classes).
+      # @return [Object] the stubbed value of the constant
+      #
+      # @example
+      #
+      #   stub_const("MyClass", Class.new) # => Replaces (or defines) MyClass with a new class object.
+      #   stub_const("SomeModel::PER_PAGE", 5) # => Sets SomeModel::PER_PAGE to 5.
+      #
+      #   class CardDeck
+      #     SUITS = [:Spades, :Diamonds, :Clubs, :Hearts]
+      #     NUM_CARDS = 52
+      #   end
+      #
+      #   stub_const("CardDeck", Class.new)
+      #   CardDeck::SUITS # => uninitialized constant error
+      #   CardDeck::NUM_CARDS # => uninitialized constant error
+      #
+      #   stub_const("CardDeck", Class.new, :transfer_nested_constants => true)
+      #   CardDeck::SUITS # => our suits array
+      #   CardDeck::NUM_CARDS # => 52
+      #
+      #   stub_const("CardDeck", Class.new, :transfer_nested_constants => [:SUITS])
+      #   CardDeck::SUITS # => our suits array
+      #   CardDeck::NUM_CARDS # => uninitialized constant error
+      def stub_const(constant_name, value, options = {})
+        ConstantStubber.stub(constant_name, value, options)
+      end
+
     private
       
       def declare_double(declared_as, *args)

data/lib/rspec/mocks/framework.rb

@@ -9,7 +9,7 @@ require 'rspec/mocks/argument_matchers'
 require 'rspec/mocks/proxy'
 require 'rspec/mocks/test_double'
 require 'rspec/mocks/mock'
-require 'rspec/mocks/argument_expectation'
+require 'rspec/mocks/argument_list_matcher'
 require 'rspec/mocks/message_expectation'
 require 'rspec/mocks/order_group'
 require 'rspec/mocks/errors'
@@ -17,3 +17,4 @@ require 'rspec/mocks/error_generator'
 require 'rspec/mocks/space'
 require 'rspec/mocks/serialization'
 require 'rspec/mocks/any_instance'
+require 'rspec/mocks/stub_const'

data/lib/rspec/mocks/message_expectation.rb

@@ -3,11 +3,10 @@ module RSpec
 
     class MessageExpectation
       # @private
-      attr_reader :message
-      attr_writer :expected_received_count, :expected_from, :argument_expectation, :implementation
-      protected :expected_received_count=, :expected_from=, :implementation=
       attr_accessor :error_generator
-      protected :error_generator, :error_generator=
+      attr_reader :message
+      attr_writer :expected_received_count, :expected_from, :argument_list_matcher
+      protected :expected_received_count=, :expected_from=, :error_generator, :error_generator=
 
       # @private
       def initialize(error_generator, expectation_ordering, expected_from, message, expected_received_count=1, opts={}, &implementation)
@@ -17,7 +16,7 @@ module RSpec
         @message = message
         @actual_received_count = 0
         @expected_received_count = expected_received_count
-        @argument_expectation = ArgumentExpectation.new(ArgumentMatchers::AnyArgsMatcher.new)
+        @argument_list_matcher = ArgumentListMatcher.new(ArgumentMatchers::AnyArgsMatcher.new)
         @consecutive = false
         @exception_to_raise = nil
         @args_to_throw = []
@@ -30,6 +29,12 @@ module RSpec
         @implementation = implementation
       end
 
+      def implementation=(implementation)
+        @consecutive = false
+        @implementation = implementation
+      end
+      protected :implementation=
+
       # @private
       def build_child(expected_from, expected_received_count, opts={}, &implementation)
         child = clone
@@ -41,13 +46,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.argument_list_matcher = ArgumentListMatcher.new(ArgumentMatchers::AnyArgsMatcher.new)
         child
       end
 
       # @private
       def expected_args
-        @argument_expectation.args
+        @argument_list_matcher.expected_args
       end
 
       # @overload and_return(value)
@@ -87,7 +92,7 @@ module RSpec
       #   counter.stub(:count) { 1 }
       #   counter.count # => 1
       def and_return(*values, &implementation)
-        @expected_received_count = [@expected_received_count, values.size].max unless ignoring_args?
+        @expected_received_count = [@expected_received_count, values.size].max unless ignoring_args? || (@expected_received_count == 0 and @at_least)
         @consecutive = true if values.size > 1
         @implementation = implementation || build_implementation(values)
       end
@@ -110,7 +115,7 @@ module RSpec
       #   car.stub(:go).and_raise
       #   car.stub(:go).and_raise(OutOfGas)
       #   car.stub(:go).and_raise(OutOfGas.new(2, :oz))
-      def and_raise(exception=Exception)
+      def and_raise(exception=RuntimeError)
         @exception_to_raise = exception
       end
 
@@ -148,12 +153,12 @@ module RSpec
 
       # @private
       def matches?(message, *args)
-        @message == message && @argument_expectation.args_match?(*args)
+        @message == message && @argument_list_matcher.args_match?(*args)
       end
 
       # @private
       def invoke(*args, &block)
-        if @expected_received_count == 0 || ((@exactly || @at_most) && (@actual_received_count == @expected_received_count))
+        if (@expected_received_count == 0 && !@at_least) || ((@exactly || @at_most) && (@actual_received_count == @expected_received_count))
           @actual_received_count += 1
           @failed_fast = true
           @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, *args)
@@ -194,12 +199,15 @@ MESSAGE
 
       # @private
       def called_max_times?
-        @expected_received_count != :any && @expected_received_count > 0 && @actual_received_count >= @expected_received_count
+        @expected_received_count != :any &&
+          !@at_least &&
+          @expected_received_count > 0 &&
+          @actual_received_count >= @expected_received_count
       end
 
       # @private
       def matches_name_but_not_args(message, *args)
-        @message == message and not @argument_expectation.args_match?(*args)
+        @message == message and not @argument_list_matcher.args_match?(*args)
       end
 
       # @private
@@ -248,7 +256,7 @@ MESSAGE
       # @private
       def generate_error
         if similar_messages.empty?
-          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, *@argument_expectation.args)
+          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, *expected_args)
         else
           @error_generator.raise_similar_message_args_error(self, *@similar_messages)
         end
@@ -284,7 +292,7 @@ MESSAGE
       #   # => passes
       def with(*args, &block)
         @implementation = block if block_given? unless args.empty?
-        @argument_expectation = ArgumentExpectation.new(*args, &block)
+        @argument_list_matcher = ArgumentListMatcher.new(*args, &block)
         self
       end
 
@@ -467,6 +475,10 @@ MESSAGE
         super(error_generator, expectation_ordering, expected_from, message, 0, {}, &implementation)
       end
 
+      def and_return(*)
+        # no-op
+      end
+
       # @private
       def negative_expectation_for?(message)
         return @message == message

data/lib/rspec/mocks/methods.rb

@@ -135,6 +135,10 @@ module RSpec
           mp
         end
       end
+      
+      def __remove_mock_proxy
+        @mock_proxy = nil
+      end
 
       def format_chain(*chain, &blk)
         if Hash === chain.last

data/lib/rspec/mocks/proxy.rb

@@ -65,6 +65,7 @@ module RSpec
 
       # @private
       def add_message_expectation(location, method_name, opts={}, &block)        
+        block ||= Proc.new { @object } if null_object?
         method_double[method_name].add_expectation @error_generator, @expectation_ordering, location, opts, &block
       end
 
@@ -128,7 +129,7 @@ module RSpec
           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)
+          raise_missing_default_stub_error(stub, *args)
         elsif @object.is_a?(Class)
           @object.superclass.__send__(message, *args, &block)
         else
@@ -136,14 +137,19 @@ module RSpec
         end
       end
 
+      # @private
+      def raise_unexpected_message_error(method_name, *args)
+        @error_generator.raise_unexpected_message_error method_name, *args
+      end
+
       # @private
       def raise_unexpected_message_args_error(expectation, *args)
         @error_generator.raise_unexpected_message_args_error(expectation, *args)
       end
 
       # @private
-      def raise_unexpected_message_error(method_name, *args)
-        @error_generator.raise_unexpected_message_error method_name, *args
+      def raise_missing_default_stub_error(expectation, *args)
+        @error_generator.raise_missing_default_stub_error(expectation, *args)
       end
 
       private
@@ -157,7 +163,7 @@ module RSpec
       end
 
       def find_matching_expectation(method_name, *args)
-        method_double[method_name].expectations.find {|expectation| expectation.matches?(method_name, *args) && !expectation.called_max_times?} || 
+        (method_double[method_name].expectations.find {|expectation| expectation.matches?(method_name, *args) && !expectation.called_max_times?}) || 
           method_double[method_name].expectations.find {|expectation| expectation.matches?(method_name, *args)}
       end