rename method to improve clarity

rspec · Oct 23, 2013 · 9c5a718 · 9c5a718
1 parent 0ada1b9
commit 9c5a718
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/rspec/mocks/matchers/have_received.rb b/lib/rspec/mocks/matchers/have_received.rb
@@ -86,7 +86,7 @@ def generate_failure_message
 
         def expected_messages_received_in_order?
           mock_proxy.replay_received_message_on @expectation, &@block
-          @expectation.expected_messages_received? && @expectation.expected_ordering_received?
+          @expectation.expected_messages_received? && @expectation.ensure_expected_ordering_received!
         end
 
         def mock_proxy

diff --git a/lib/rspec/mocks/message_expectation.rb b/lib/rspec/mocks/message_expectation.rb
@@ -279,8 +279,9 @@ def expected_messages_received?
         ignoring_args? || matches_exact_count? || matches_at_least_count? || matches_at_most_count?
       end
 
-      def expected_ordering_received?
-        !@ordered || @order_group.verify_invocation_order(self)
+      def ensure_expected_ordering_received!
+        @order_group.verify_invocation_order(self) if @ordered
+        true
       end
 
       # @private