Give a better error message with .at_least(3).times style expectations

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
rspec · Mar 29, 2013 · 996c51c · 996c51c
1 parent 1015876
commit 996c51c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/rspec/mocks/error_generator.rb b/lib/rspec/mocks/error_generator.rb
@@ -42,8 +42,8 @@ def raise_similar_message_args_error(expectation, *args_for_multiple_calls)
       end
 
       # @private
-      def raise_expectation_error(message, expected_received_count, actual_received_count, *args)
-        __raise "(#{intro}).#{message}#{format_args(*args)}\n    expected: #{count_message(expected_received_count)}\n    received: #{count_message(actual_received_count)}"
+      def raise_expectation_error(message, expected_received_count, actual_received_count, expectation_count_type, *args)
+        __raise "(#{intro}).#{message}#{format_args(*args)}\n    expected: #{count_message(expected_received_count, expectation_count_type)}\n    received: #{count_message(actual_received_count)}"
       end
 
       # @private
@@ -117,8 +117,9 @@ def arg_list(*args)
         args.collect {|arg| arg.respond_to?(:description) ? arg.description : arg.inspect}.join(", ")
       end
 
-      def count_message(count)
-        return "at least #{pretty_print(count.abs)}" if count < 0
+      def count_message(count, expectation_count_type=nil)
+        return "at least #{pretty_print(count.abs)}" if count < 0 || expectation_count_type == :at_least
+        return "at most #{pretty_print(count)}" if expectation_count_type == :at_most
         return pretty_print(count)
       end
 

diff --git a/lib/rspec/mocks/message_expectation.rb b/lib/rspec/mocks/message_expectation.rb
@@ -168,7 +168,7 @@ def invoke(parent_stub, *args, &block)
         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)
+          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, expectation_count_type, *args)
         end
 
         @order_group.handle_order_constraint self
@@ -243,12 +243,18 @@ def advise(*args)
       # @private
       def generate_error
         if similar_messages.empty?
-          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, *expected_args)
+          @error_generator.raise_expectation_error(@message, @expected_received_count, @actual_received_count, expectation_count_type, *expected_args)
         else
           @error_generator.raise_similar_message_args_error(self, *@similar_messages)
         end
       end
 
+      def expectation_count_type
+        return :at_least if @at_least
+        return :at_most if @at_most
+        return nil
+      end
+
       def raise_out_of_order_error
         @error_generator.raise_out_of_order_error @message
       end