rspec-mocks 2.14.0.rc1 → 2.14.0

data/lib/rspec/mocks/any_instance/stub_chain.rb

@@ -22,7 +22,8 @@ module RSpec
             :with => [nil],
             :and_return => [:with, nil],
             :and_raise => [:with, nil],
-            :and_yield => [:with, nil]
+            :and_yield => [:with, nil],
+            :and_call_original => [:with, nil]
           }
         end
 

data/lib/rspec/mocks/error_generator.rb

@@ -116,6 +116,13 @@ module RSpec
                 "method has been mocked instead of stubbed."
       end
 
+      def self.raise_double_negation_error(wrapped_expression)
+        raise "Isn't life confusing enough? You've already set a " +
+              "negative message expectation and now you are trying to " +
+              "negate it again with `never`. What does an expression like " +
+              "`#{wrapped_expression}.not_to receive(:msg).never` even mean?"
+      end
+
       private
 
       def intro

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

@@ -1,13 +1,13 @@
 module Marshal
   class << self
-    def dump_with_mocks(*args)
-      object = args.shift
-
-      if ( ::RSpec::Mocks.space && !::RSpec::Mocks.space.registered?(object) ) || NilClass === object
-        return dump_without_mocks(*args.unshift(object))
+    # Duplicates any mock objects before serialization. Otherwise,
+    # serialization will fail because methods exist on the singleton class.
+    def dump_with_mocks(object, *rest)
+      if ::RSpec::Mocks.space.nil? || !::RSpec::Mocks.space.registered?(object) || NilClass === object
+        dump_without_mocks(object, *rest)
+      else
+        dump_without_mocks(object.dup, *rest)
       end
-
-      dump_without_mocks(*args.unshift(object.dup))
     end
 
     alias_method :dump_without_mocks, :dump

data/lib/rspec/mocks/matchers/receive.rb

@@ -22,7 +22,11 @@ module RSpec
         alias matches? setup_expectation
 
         def setup_negative_expectation(subject, &block)
-          setup_mock_proxy_method_substitute(subject, :add_negative_message_expectation, block)
+          # ensure `never` goes first for cases like `never.and_return(5)`,
+          # where `and_return` is meant to raise an error
+          @recorded_customizations.unshift Customization.new(:never, [], nil)
+
+          setup_expectation(subject, &block)
         end
         alias does_not_match? setup_negative_expectation
 

data/lib/rspec/mocks/message_expectation.rb

@@ -10,7 +10,7 @@ module RSpec
 
       # @private
       def initialize(error_generator, expectation_ordering, expected_from, method_double,
-                     expected_received_count=1, opts={}, &implementation)
+                     expected_received_count=1, opts={}, &implementation_block)
         @error_generator = error_generator
         @error_generator.opts = opts
         @expected_from = expected_from
@@ -24,11 +24,10 @@ module RSpec
         @args_to_yield = []
         @failed_fast = nil
         @eval_context = nil
-        @implementation = implementation
-        @values_to_return = nil
-      end
 
-      # @private
+        @implementation = Implementation.new
+        self.inner_implementation_action = implementation_block
+      end
 
       # @private
       def expected_args
@@ -72,15 +71,20 @@ module RSpec
       #   counter.stub(:count) { 1 }
       #   counter.count # => 1
       def and_return(*values, &implementation)
+        if negative?
+          RSpec.deprecate "`and_return` on a negative message expectation"
+        end
+
         @expected_received_count = [@expected_received_count, values.size].max unless ignoring_args? || (@expected_received_count == 0 and @at_least)
 
         if implementation
           # TODO: deprecate `and_return { value }`
-          @implementation = implementation
+          self.inner_implementation_action = implementation
         else
-          @values_to_return = values
-          @implementation = build_implementation
+          self.terminal_implementation_action = AndReturnImplementation.new(values)
         end
+
+        nil
       end
 
       # Tells the object to delegate to the original unmodified method
@@ -98,7 +102,7 @@ module RSpec
         if @method_double.object.is_a?(RSpec::Mocks::TestDouble)
           @error_generator.raise_only_valid_on_a_partial_mock(:and_call_original)
         else
-          @implementation = @method_double.original_method
+          @implementation = AndCallOriginalImplementation.new(@method_double.original_method)
         end
       end
 
@@ -128,7 +132,8 @@ module RSpec
           exception = message ? exception.exception(message) : exception.exception
         end
 
-        @implementation = Proc.new { raise exception }
+        self.terminal_implementation_action = Proc.new { raise exception }
+        nil
       end
 
       # @overload and_throw(symbol)
@@ -142,7 +147,8 @@ module RSpec
       #   car.stub(:go).and_throw(:out_of_gas)
       #   car.stub(:go).and_throw(:out_of_gas, :level => 0.1)
       def and_throw(*args)
-        @implementation = Proc.new { throw(*args) }
+        self.terminal_implementation_action = Proc.new { throw(*args) }
+        nil
       end
 
       # Tells the object to yield one or more args to a block when the message
@@ -154,7 +160,7 @@ module RSpec
       def and_yield(*args, &block)
         yield @eval_context = Object.new.extend(RSpec::Mocks::InstanceExec) if block
         @args_to_yield << args
-        @implementation = build_implementation
+        self.initial_implementation_action = AndYieldImplementation.new(@args_to_yield, @eval_context, @error_generator)
         self
       end
 
@@ -165,7 +171,7 @@ module RSpec
 
       # @private
       def invoke(parent_stub, *args, &block)
-        if (@expected_received_count == 0 && !@at_least) || ((@exactly || @at_most) && (@actual_received_count == @expected_received_count))
+        if negative? || ((@exactly || @at_most) && (@actual_received_count == @expected_received_count))
           @actual_received_count += 1
           @failed_fast = true
           #args are the args we actually received, @argument_list_matcher is the
@@ -176,8 +182,8 @@ module RSpec
         @order_group.handle_order_constraint self
 
         begin
-          if @implementation
-            @implementation.call(*args, &block)
+          if implementation.present?
+            implementation.call(*args, &block)
           elsif parent_stub
             parent_stub.invoke(nil, *args, &block)
           end
@@ -186,6 +192,11 @@ module RSpec
         end
       end
 
+      # @private
+      def negative?
+        @expected_received_count == 0 && !@at_least
+      end
+
       # @private
       def called_max_times?
         @expected_received_count != :any &&
@@ -291,7 +302,7 @@ module RSpec
       #   cart.add(Book.new(:isbn => 1934356379))
       #   # => passes
       def with(*args, &block)
-        @implementation = block if block_given? unless args.empty?
+        self.inner_implementation_action = block if block_given? unless args.empty?
         @argument_list_matcher = ArgumentListMatcher.new(*args, &block)
         self
       end
@@ -303,7 +314,7 @@ module RSpec
       #
       #   dealer.should_receive(:deal_card).exactly(10).times
       def exactly(n, &block)
-        @implementation = block if block
+        self.inner_implementation_action = block
         set_expected_received_count :exactly, n
         self
       end
@@ -319,7 +330,7 @@ module RSpec
           RSpec.deprecate "at_least(0) with should_receive", :replacement => "stub"
         end
 
-        @implementation = block if block
+        self.inner_implementation_action = block
         set_expected_received_count :at_least, n
         self
       end
@@ -331,7 +342,7 @@ module RSpec
       #
       #   dealer.should_receive(:deal_card).at_most(10).times
       def at_most(n, &block)
-        @implementation = block if block
+        self.inner_implementation_action = block
         set_expected_received_count :at_most, n
         self
       end
@@ -344,7 +355,7 @@ module RSpec
       #   dealer.should_receive(:deal_card).at_least(10).times
       #   dealer.should_receive(:deal_card).at_most(10).times
       def times(&block)
-        @implementation = block if block
+        self.inner_implementation_action = block
         self
       end
 
@@ -352,7 +363,7 @@ module RSpec
       # Allows an expected message to be received any number of times.
       def any_number_of_times(&block)
         RSpec.deprecate "any_number_of_times", :replacement => "stub"
-        @implementation = block if block
+        self.inner_implementation_action = block
         @expected_received_count = :any
         self
       end
@@ -363,6 +374,7 @@ module RSpec
       #
       #   car.should_receive(:stop).never
       def never
+        ErrorGenerator.raise_double_negation_error("expect(obj)") if negative?
         @expected_received_count = 0
         self
       end
@@ -373,7 +385,7 @@ module RSpec
       #
       #   car.should_receive(:go).once
       def once(&block)
-        @implementation = block if block
+        self.inner_implementation_action = block
         set_expected_received_count :exactly, 1
         self
       end
@@ -384,7 +396,7 @@ module RSpec
       #
       #   car.should_receive(:go).twice
       def twice(&block)
-        @implementation = block if block
+        self.inner_implementation_action = block
         set_expected_received_count :exactly, 2
         self
       end
@@ -397,7 +409,7 @@ module RSpec
       #   api.should_receive(:run).ordered
       #   api.should_receive(:finish).ordered
       def ordered(&block)
-        @implementation = block if block
+        self.inner_implementation_action = block
         @order_group.register(self)
         @ordered = true
         self
@@ -405,7 +417,7 @@ module RSpec
 
       # @private
       def negative_expectation_for?(message)
-        return false
+        @message == message && negative?
       end
 
       # @private
@@ -418,7 +430,7 @@ module RSpec
         @actual_received_count += 1
       end
 
-      protected
+    private
 
       def failed_fast?
         @failed_fast
@@ -435,58 +447,33 @@ module RSpec
                                    end
       end
 
-      private
-
-      def build_implementation
-        Implementation.new(
-          @values_to_return, @args_to_yield,
-          @eval_context, @error_generator
-        ).method(:call)
-      end
-    end
-
-    # @private
-    class NegativeMessageExpectation < MessageExpectation
-      # @private
-      def initialize(error_generator, expectation_ordering, expected_from, method_double, &implementation)
-        super(error_generator, expectation_ordering, expected_from, method_double, 0, {}, &implementation)
+      def initial_implementation_action=(action)
+        implementation.initial_action = action
       end
 
-      # no-op
-      # @deprecated and_return is not supported with negative message expectations.
-      def and_return(*)
-        RSpec.deprecate "and_return with should_not_receive"
+      def inner_implementation_action=(action)
+        implementation.inner_action = action if action
       end
 
-      # @private
-      def negative_expectation_for?(message)
-        return @message == message
+      def terminal_implementation_action=(action)
+        implementation.terminal_action = action
       end
     end
 
-    # Represents a configured implementation. Takes into account
-    # `and_return` and `and_yield` instructions.
+    # Handles the implementation of an `and_yield` declaration.
     # @private
-    class Implementation
-      def initialize(values_to_return, args_to_yield, eval_context, error_generator)
-        @values_to_return = values_to_return
+    class AndYieldImplementation
+      def initialize(args_to_yield, eval_context, error_generator)
         @args_to_yield = args_to_yield
         @eval_context = eval_context
         @error_generator = error_generator
       end
 
-      def call(*args_to_ignore, &block)
-        default_return_value = perform_yield(&block)
-        return default_return_value unless @values_to_return
-
-        if @values_to_return.size > 1
-          @values_to_return.shift
-        else
-          @values_to_return.first
-        end
+      def arity
+        -1
       end
 
-      def perform_yield(&block)
+      def call(*args_to_ignore, &block)
         return if @args_to_yield.empty? && @eval_context.nil?
 
         @error_generator.raise_missing_block_error @args_to_yield unless block
@@ -500,5 +487,97 @@ module RSpec
         value
       end
     end
+
+    # Handles the implementation of an `and_return` implementation.
+    # @private
+    class AndReturnImplementation
+      def initialize(values_to_return)
+        @values_to_return = values_to_return
+      end
+
+      def arity
+        -1
+      end
+
+      def call(*args_to_ignore, &block)
+        if @values_to_return.size > 1
+          @values_to_return.shift
+        else
+          @values_to_return.first
+        end
+      end
+    end
+
+    # Represents a configured implementation. Takes into account
+    # any number of sub-implementations.
+    # @private
+    class Implementation
+      attr_accessor :initial_action, :inner_action, :terminal_action
+
+      def call(*args, &block)
+        actions.map do |action|
+          action.call(*arg_slice_for(args, action.arity), &block)
+        end.last
+      end
+
+      def arg_slice_for(args, arity)
+        if arity >= 0
+          args.slice(0, arity)
+        else
+          args
+        end
+      end
+
+      def present?
+        actions.any?
+      end
+
+    private
+
+      def actions
+        [initial_action, inner_action, terminal_action].compact
+      end
+    end
+
+    # Represents an `and_call_original` implementation.
+    # @private
+    class AndCallOriginalImplementation
+      def initialize(method)
+        @method = method
+      end
+
+      CannotModifyFurtherError = Class.new(StandardError)
+
+      def arity
+        @method.arity
+      end
+
+      def initial_action=(value)
+        raise cannot_modify_further_error
+      end
+
+      def inner_action=(value)
+        raise cannot_modify_further_error
+      end
+
+      def terminal_action=(value)
+        raise cannot_modify_further_error
+      end
+
+      def present?
+        true
+      end
+
+      def call(*args, &block)
+        @method.call(*args, &block)
+      end
+
+    private
+
+      def cannot_modify_further_error
+        CannotModifyFurtherError.new "This method has already been configured " +
+          "to call the original implementation, and cannot be modified further."
+      end
+    end
   end
 end

data/lib/rspec/mocks/method_double.rb

@@ -226,15 +226,6 @@ module RSpec
         expectation
       end
 
-      # @private
-      def add_negative_expectation(error_generator, expectation_ordering, expected_from, &implementation)
-        configure_method
-        expectation = NegativeMessageExpectation.new(error_generator, expectation_ordering,
-                                                     expected_from, self, &implementation)
-        expectations.unshift expectation
-        expectation
-      end
-
       # @private
       def build_expectation(error_generator, expectation_ordering)
         expected_from = IGNORED_BACKTRACE_LINE