rspec-mocks 3.0.4 → 3.12.6

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

@@ -3,41 +3,46 @@ module RSpec
     module Matchers
       # @private
       class ReceiveMessages
+        include Matcher
 
         def initialize(message_return_value_hash)
           @message_return_value_hash = message_return_value_hash
           @backtrace_line = CallerFilter.first_non_rspec_line
         end
 
-        def name
+        def matcher_name
           "receive_messages"
         end
 
+        def description
+          "receive messages: #{@message_return_value_hash.inspect}"
+        end
+
         def setup_expectation(subject)
           warn_about_block if block_given?
-          each_message_on( proxy_on(subject) ) do |host, message, return_value|
+          each_message_on(proxy_on(subject)) do |host, message, return_value|
             host.add_simple_expectation(message, return_value, @backtrace_line)
           end
         end
         alias matches? setup_expectation
 
-        def setup_negative_expectation(subject)
+        def setup_negative_expectation(_subject)
           raise NegationUnsupportedError,
-            "`expect(...).to_not receive_messages` is not supported since it " +
-            "doesn't really make sense. What would it even mean?"
+                "`expect(...).to_not receive_messages` is not supported since it " \
+                "doesn't really make sense. What would it even mean?"
         end
         alias does_not_match? setup_negative_expectation
 
         def setup_allowance(subject)
           warn_about_block if block_given?
-          each_message_on( proxy_on(subject) ) do |host, message, return_value|
+          each_message_on(proxy_on(subject)) do |host, message, return_value|
             host.add_simple_stub(message, return_value)
           end
         end
 
         def setup_any_instance_expectation(subject)
           warn_about_block if block_given?
-          each_message_on( any_instance_of(subject) ) do |host, message, return_value|
+          each_message_on(any_instance_of(subject)) do |host, message, return_value|
             host.should_receive(message).and_return(return_value)
           end
         end

data/lib/rspec/mocks/message_chain.rb

@@ -12,10 +12,10 @@ module RSpec
       # @api private
       def setup_chain
         if chain.length > 1
-          if matching_stub = find_matching_stub
+          if (matching_stub = find_matching_stub)
             chain.shift
             chain_on(matching_stub.invoke(nil), *chain, &@block)
-          elsif matching_expectation = find_matching_expectation
+          elsif (matching_expectation = find_matching_expectation)
             chain.shift
             chain_on(matching_expectation.invoke_without_incrementing_received_count(nil), *chain, &@block)
           else
@@ -30,10 +30,6 @@ module RSpec
 
     private
 
-      def expectation(object, message, &return_block)
-        raise NotImplementedError.new
-      end
-
       def chain_on(object, *chain, &block)
         initialize(object, *chain, &block)
         setup_chain
@@ -42,7 +38,7 @@ module RSpec
       def format_chain(*chain, &blk)
         if Hash === chain.last
           hash = chain.pop
-          hash.each do |k,v|
+          hash.each do |k, v|
             chain << k
             blk = Proc.new { v }
           end