Merge 9c5a718 into c429c8b

Changelog.md

@@ -43,6 +43,7 @@ Enhancements:
 * `instance_double` and `class_double` raise `ArgumentError` if the underlying
   module is loaded and the arity of the method being invoked does not match the
   arity of the method as it is actually implemented.  (Andy Lindeman)
+* Spies can now check their invocation ordering is correct. (Jon Rowe)
 
 Deprecations:
 

lib/rspec/mocks/matchers/have_received.rb

@@ -4,7 +4,7 @@ module Matchers
       class HaveReceived
         COUNT_CONSTRAINTS = %w(exactly at_least at_most times once twice)
         ARGS_CONSTRAINTS = %w(with)
-        CONSTRAINTS = COUNT_CONSTRAINTS + ARGS_CONSTRAINTS
+        CONSTRAINTS = COUNT_CONSTRAINTS + ARGS_CONSTRAINTS + %w(ordered)
 
         def initialize(method_name, &block)
           @method_name = method_name
@@ -21,14 +21,14 @@ def matches?(subject, &block)
           @block ||= block
           @subject = subject
           @expectation = expect
-          expected_messages_received?
+          expected_messages_received_in_order?
         end
 
         def does_not_match?(subject)
           @subject = subject
           ensure_count_unconstrained
           @expectation = expect.never
-          expected_messages_received?
+          expected_messages_received_in_order?
         end
 
         def failure_message
@@ -50,7 +50,7 @@ def description
           end
         end
 
-        private
+      private
 
         def expect
           expectation = mock_proxy.build_expectation(@method_name)
@@ -84,9 +84,9 @@ def generate_failure_message
           error.message
         end
 
-        def expected_messages_received?
+        def expected_messages_received_in_order?
           mock_proxy.replay_received_message_on @expectation, &@block
-          @expectation.expected_messages_received?
+          @expectation.expected_messages_received? && @expectation.ensure_expected_ordering_received!
         end
 
         def mock_proxy

lib/rspec/mocks/message_expectation.rb

@@ -55,6 +55,8 @@ def initialize(error_generator, expectation_ordering, expected_from, method_doub
         @expected_received_count = expected_received_count
         @argument_list_matcher = ArgumentListMatcher::MATCH_ALL
         @order_group = expectation_ordering
+        @order_group.register(self)
+        @ordered = false
         @at_least = @at_most = @exactly = nil
         @args_to_yield = []
         @failed_fast = nil
@@ -277,6 +279,11 @@ def expected_messages_received?
         ignoring_args? || matches_exact_count? || matches_at_least_count? || matches_at_most_count?
       end
 
+      def ensure_expected_ordering_received!
+        @order_group.verify_invocation_order(self) if @ordered
+        true
+      end
+
       # @private
       def ignoring_args?
         @expected_received_count == :any
@@ -462,11 +469,15 @@ def twice(&block)
       #   api.should_receive(:finish).ordered
       def ordered(&block)
         self.inner_implementation_action = block
-        @order_group.register(self)
         @ordered = true
         self
       end
 
+      # @private
+      def ordered?
+        @ordered
+      end
+
       # @private
       def negative_expectation_for?(message)
         @message == message && negative?

lib/rspec/mocks/order_group.rb

@@ -3,38 +3,80 @@ module Mocks
     # @private
     class OrderGroup
       def initialize
-        @ordering = Array.new
+        @expectations = []
+        @invocation_order = []
+        @index = 0
       end
 
       # @private
       def register(expectation)
-        @ordering << expectation
+        @expectations << expectation
+      end
+
+      def invoked(message)
+        @invocation_order << message
       end
 
       # @private
       def ready_for?(expectation)
-        @ordering.first == expectation
+        remaining_expectations.find(&:ordered?) == expectation
       end
 
       # @private
       def consume
-        @ordering.shift
+        remaining_expectations.each_with_index do |expectation, index|
+          if expectation.ordered?
+            @index += index + 1
+            return expectation
+          end
+        end
+        nil
       end
 
       # @private
       def handle_order_constraint(expectation)
-        return unless @ordering.include?(expectation)
+        return unless expectation.ordered? && @expectations.include?(expectation)
         return consume if ready_for?(expectation)
         expectation.raise_out_of_order_error
       end
 
+      def verify_invocation_order(expectation)
+        expectation.raise_out_of_order_error unless expectations_invoked_in_order?
+        true
+      end
+
       def clear
-        @ordering.clear
+        @index = 0
+        @invocation_order.clear
+        @expectations.clear
       end
 
       def empty?
-        @ordering.empty?
+        @expectations.empty?
+      end
+
+    private
+
+      def remaining_expectations
+        @expectations[@index..-1] || []
+      end
+
+      def expectations_invoked_in_order?
+        invoked_expectations == expected_invocations
+      end
+
+      def invoked_expectations
+        @expectations.select { |e| e.ordered? && @invocation_order.include?(e) }
+      end
+
+      def expected_invocations
+        @invocation_order.map { |invocation| expectation_for(invocation) }.compact
+      end
+
+      def expectation_for(message)
+        @expectations.find { |e| message == e }
       end
+
     end
   end
 end

lib/rspec/mocks/proxy.rb

@@ -2,10 +2,16 @@ module RSpec
   module Mocks
     # @private
     class Proxy
+      SpecificMessage = Struct.new(:object,:message) do
+        def ==(expectation)
+          expectation.orig_object == object && expectation.message == message
+        end
+      end
 
       # @private
-      def initialize(object, name=nil, options={})
+      def initialize(object, order_group, name=nil, options={})
         @object = object
+        @order_group = order_group
         @name = name
         @error_generator = ErrorGenerator.new(object, name)
         @expectation_ordering = RSpec::Mocks::space.expectation_ordering
@@ -139,6 +145,7 @@ def has_negative_expectation?(message)
 
       # @private
       def record_message_received(message, *args, &block)
+        @order_group.invoked SpecificMessage.new(object, message)
         @messages_received << [message, args, block]
       end
 

lib/rspec/mocks/proxy_for_nil.rb

@@ -3,9 +3,9 @@ module Mocks
     # @private
     class ProxyForNil < Proxy
 
-      def initialize
+      def initialize(order_group)
         @warn_about_expectations = true
-        super nil
+        super nil, order_group
       end
       attr_accessor :warn_about_expectations
       alias warn_about_expectations? warn_about_expectations

lib/rspec/mocks/space.rb

@@ -54,10 +54,10 @@ def proxy_for(object)
         id = id_for(object)
         proxies.fetch(id) do
           proxies[id] = case object
-                        when NilClass   then ProxyForNil.new
-                        when TestDouble then object.__build_mock_proxy
+                        when NilClass   then ProxyForNil.new(expectation_ordering)
+                        when TestDouble then object.__build_mock_proxy(expectation_ordering)
                         else
-                          PartialMockProxy.new(object)
+                          PartialMockProxy.new(object, expectation_ordering)
                         end
         end
       end

lib/rspec/mocks/test_double.rb

@@ -61,8 +61,8 @@ def respond_to?(message, incl_private=false)
       end
 
       # @private
-      def __build_mock_proxy
-        Proxy.new(self, @name)
+      def __build_mock_proxy(order_group)
+        Proxy.new(self, order_group, @name)
       end
 
     private

lib/rspec/mocks/verifying_double.rb

@@ -27,8 +27,8 @@ def initialize(doubled_module, *args)
         __initialize_as_test_double(doubled_module, *args)
       end
 
-      def __build_mock_proxy
-        VerifyingProxy.new(self,
+      def __build_mock_proxy(order_group)
+        VerifyingProxy.new(self, order_group,
           @doubled_module,
           InstanceMethodReference
         )
@@ -47,8 +47,8 @@ def initialize(doubled_module, *args)
         __initialize_as_test_double(doubled_module, *args)
       end
 
-      def __build_mock_proxy
-        VerifyingProxy.new(self,
+      def __build_mock_proxy(order_group)
+        VerifyingProxy.new(self, order_group,
           @doubled_module,
           ObjectMethodReference
         )

lib/rspec/mocks/verifying_proxy.rb

@@ -19,8 +19,8 @@ module Mocks
     #
     # @api private
     class VerifyingProxy < Proxy
-      def initialize(object, name, method_reference_class)
-        super(object)
+      def initialize(object, order_group, name, method_reference_class)
+        super(object, order_group)
         @object                 = object
         @doubled_module         = name
         @method_reference_class = method_reference_class

spec/rspec/mocks/matchers/have_received_spec.rb

@@ -247,6 +247,28 @@ module Mocks
             end
           end
         end
+
+        context 'ordered' do
+          let(:dbl) { double :one => 1, :two => 2 }
+
+          it 'passes when the messages were received in order' do
+            dbl.one
+            dbl.two
+
+            expect(dbl).to have_received(:one).ordered
+            expect(dbl).to have_received(:two).ordered
+          end
+
+          it 'fails when the messages are received out of order' do
+            dbl.two
+            dbl.one
+
+            expect {
+              expect(dbl).to have_received(:one).ordered
+              expect(dbl).to have_received(:two).ordered
+            }.to raise_error(/received :two out of order/m)
+          end
+        end
       end
 
       describe "expect(...).not_to have_received" do

spec/rspec/mocks/order_group_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+describe 'OrderGroup' do
+  let(:order_group) { ::RSpec::Mocks::OrderGroup.new }
+
+  describe '#consume' do
+    let(:ordered_1) { double :ordered? => true }
+    let(:ordered_2) { double :ordered? => true }
+    let(:unordered) { double :ordered? => false }
+
+    before do
+      order_group.register unordered
+      order_group.register ordered_1
+      order_group.register unordered
+      order_group.register ordered_2
+      order_group.register unordered
+      order_group.register unordered
+    end
+
+    it 'returns the first ordered? expectation' do
+      expect(order_group.consume).to eq ordered_1
+    end
+    it 'keeps returning ordered? expectation until all are returned' do
+      expectations = 3.times.map { order_group.consume }
+      expect(expectations).to eq [ordered_1, ordered_2, nil]
+    end
+  end
+end