rspec-mocks 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4228dd818e7161f972b35380ad510d2c9f42846
-  data.tar.gz: 6b51cb642d8ab3a56c2bbacb6670bdbe0f5a8a80
+  metadata.gz: 0bb4586d03e4b2bf84d904af032165dfae270599
+  data.tar.gz: 6889f7727cf4545a05618a19c0f7ff35174718ff
 SHA512:
-  metadata.gz: 33be4cf0a047a9e96eb84a057d59554ec8a0299cd67e8c8a26017f8d4b76f453edbe54754ea8c2362ef117cd1997ad32f0b6c36afb17e04434398f9d7609d601
-  data.tar.gz: 15736e89331dd0b9bce1c3a7c96261cd692e4135bfbdc6a3f93adfd972f3453c3283311db099c8404495941dd86df668273ae62eee4e1f7ffcce5cc31aa1c29e
+  metadata.gz: 5bb9e03448dfde3e78aec7388dd7b49bccb8005ec49a7ab525b41818a6678e41568fa7946a4d443a8103058d77c4ae2760ac07eb69b0ef37dd39f197e580aa48
+  data.tar.gz: 00a6e20fb91ccb3dd7212ac5877e9b348609aede07ed8158aee6032f1e30d7d89a833a7d1107343e780da15daa0800d94985cdd151796434f5413c8663935fa0

data/Changelog.md

@@ -1,3 +1,50 @@
+### 3.3.0 / 2015-06-12
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.2.1...v3.3.0)
+
+Enhancements:
+
+* When stubbing `new` on `MyClass` or `class_double(MyClass)`, use the
+  method signature from `MyClass#initialize` to verify arguments.
+  (Myron Marston, #886)
+* Use matcher descriptions when generating description of received arguments
+  for mock expectation failures. (Tim Wade, #891)
+* Avoid loading `stringio` unnecessarily. (Myron Marston, #894)
+* Verifying doubles failure messages now distinguish between class and instance
+  level methods. (Tim Wade, #896, #908)
+* Improve mock expectation failure messages so that it combines both
+  number of times and the received arguments in the output. (John Ceh, #918)
+* Improve how test doubles are represented in failure messages.
+  (Siva Gollapalli, Myron Marston, #932)
+* Rename `RSpec::Mocks::Configuration#when_declaring_verifying_double` to
+  `RSpec::Mocks::Configuration#before_verifying_doubles` and utilise when
+  verifying partial doubles. (Jon Rowe, #940)
+* Use rspec-support's `ObjectFormatter` for improved formatting of
+  arguments in failure messages so that, for example, full time
+  precisions is displayed for time objects. (Gavin Miller, Myron Marston, #955)
+
+Bug Fixes:
+
+* Ensure expectations that raise eagerly also raise during RSpec verification.
+  This means that if exceptions are caught inside test execution the test will
+  still fail. (Sam Phippen, #884)
+* Fix `have_received(msg).with(args).exactly(n).times` and
+  `receive(msg).with(args).exactly(n).times` failure messages
+  for when the message was received the wrong number of times with
+  the specified args, and also received additional times with other
+  arguments. Previously it confusingly listed the arguments as being
+  mis-matched (even when the double was allowed to receive with any
+  args) rather than listing the count. (John Ceh, #918)
+* Fix `any_args`/`anything` support so that we avoid calling `obj == anything`
+  on user objects that may have improperly implemented `==` in a way that
+  raises errors. (Myron Marston, #924)
+* Fix edge case involving stubbing the same method on a class and a subclass
+  which previously hit a `NoMethodError` internally in RSpec. (Myron Marston #954)
+* Fix edge case where the message received count would be incremented multiple
+  times for one failure. (Myron Marston, #957)
+* Fix failure messages for when spies received the expected message with
+  different arguments and also received another message. (Maurício Linhares, #960)
+* Silence whitespace-only diffs. (Myron Marston, #969)
+
 ### 3.2.1 / 2015-02-23
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.2.0...v3.2.1)
 

data/README.md

@@ -417,8 +417,8 @@ There are many different viewpoints about the meaning of mocks and stubs. If
 you are interested in learning more, here is some recommended reading:
 
 * Mock Objects: http://www.mockobjects.com/
-* Endo-Testing: http://stalatest.googlecode.com/svn/trunk/Literatur/mockobjects.pdf
-* Mock Roles, Not Objects: http://jmock.org/oopsla2004.pdf
+* Endo-Testing: http://www.ccs.neu.edu/research/demeter/related-work/extreme-programming/MockObjectsFinal.PDF
+* Mock Roles, Not Objects: http://www.jmock.org/oopsla2004.pdf
 * Test Double: http://www.martinfowler.com/bliki/TestDouble.html
 * Test Double Patterns: http://xunitpatterns.com/Test%20Double%20Patterns.html
 * Mocks aren't stubs: http://www.martinfowler.com/articles/mocksArentStubs.html

data/lib/rspec/mocks/any_instance.rb

@@ -1,5 +1,6 @@
 %w[
   any_instance/chain
+  any_instance/error_generator
   any_instance/stub_chain
   any_instance/stub_chain_chain
   any_instance/expect_chain_chain

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

@@ -76,7 +76,7 @@ module RSpec
         end
 
         def never
-          ErrorGenerator.raise_double_negation_error("expect_any_instance_of(MyClass)") if negated?
+          AnyInstance.error_generator.raise_double_negation_error("expect_any_instance_of(MyClass)") if negated?
           super
         end
 

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

@@ -0,0 +1,31 @@
+module RSpec
+  module Mocks
+    module AnyInstance
+      # @private
+      class ErrorGenerator < ::RSpec::Mocks::ErrorGenerator
+        def raise_second_instance_received_message_error(unfulfilled_expectations)
+          __raise "Exactly one instance should have received the following " \
+                  "message(s) but didn't: #{unfulfilled_expectations.sort.join(', ')}"
+        end
+
+        def raise_does_not_implement_error(klass, method_name)
+          __raise "#{klass} does not implement ##{method_name}"
+        end
+
+        def raise_message_already_received_by_other_instance_error(method_name, object_inspect, invoked_instance)
+          __raise "The message '#{method_name}' was received by #{object_inspect} " \
+                  "but has already been received by #{invoked_instance}"
+        end
+
+        def raise_not_supported_with_prepend_error(method_name, problem_mod)
+          __raise "Using `any_instance` to stub a method (#{method_name}) that has been " \
+                  "defined on a prepended module (#{problem_mod}) is not supported."
+        end
+      end
+
+      def self.error_generator
+        @error_generator ||= ErrorGenerator.new
+      end
+    end
+  end
+end

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

@@ -75,9 +75,7 @@ module RSpec
           return unless ExpectationChain === instance
           return if @instance_with_expectation.equal?(instance)
 
-          raise RSpec::Mocks::MockExpectationError,
-                "Exactly one instance should have received the following " \
-                "message(s) but didn't: #{unfulfilled_expectations.sort.join(', ')}"
+          AnyInstance.error_generator.raise_second_instance_received_message_error(unfulfilled_expectations)
         end
       end
     end

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

@@ -76,7 +76,7 @@ module RSpec
         # @see Methods#unstub
         def unstub(method_name)
           unless @observed_methods.include?(method_name.to_sym)
-            raise RSpec::Mocks::MockExpectationError, "The method `#{method_name}` was not stubbed or was already unstubbed"
+            AnyInstance.error_generator.raise_method_not_stubbed_error(method_name)
           end
           message_chains.remove_stub_chains_for!(method_name)
           stubs[method_name].clear
@@ -91,9 +91,7 @@ module RSpec
           return unless @expectation_set
           return if message_chains.all_expectations_fulfilled?
 
-          raise RSpec::Mocks::MockExpectationError,
-                "Exactly one instance should have received the following " \
-                "message(s) but didn't: #{message_chains.unfulfilled_expectations.sort.join(', ')}"
+          AnyInstance.error_generator.raise_second_instance_received_message_error(message_chains.unfulfilled_expectations)
         end
 
         # @private
@@ -221,8 +219,7 @@ module RSpec
 
           if RSpec::Mocks.configuration.verify_partial_doubles?
             unless public_protected_or_private_method_defined?(method_name)
-              raise MockExpectationError,
-                    "#{@klass} does not implement ##{method_name}"
+              AnyInstance.error_generator.raise_does_not_implement_error(@klass, method_name)
             end
           end
 
@@ -242,7 +239,9 @@ module RSpec
           @klass.__send__(:define_method, method_name) do |*_args, &_blk|
             invoked_instance = recorder.instance_that_received(method_name)
             inspect = "#<#{self.class}:#{object_id} #{instance_variables.map { |name| "#{name}=#{instance_variable_get name}" }.join(', ')}>"
-            raise RSpec::Mocks::MockExpectationError, "The message '#{method_name}' was received by #{inspect} but has already been received by #{invoked_instance}"
+            AnyInstance.error_generator.raise_message_already_received_by_other_instance_error(
+              method_name, inspect, invoked_instance
+            )
           end
         end
 
@@ -252,9 +251,7 @@ module RSpec
             problem_mod = prepended_modules.find { |mod| mod.method_defined?(method_name) }
             return unless problem_mod
 
-            raise RSpec::Mocks::MockExpectationError,
-                  "Using `any_instance` to stub a method (#{method_name}) that has been " \
-                  "defined on a prepended module (#{problem_mod}) is not supported."
+            AnyInstance.error_generator.raise_not_supported_with_prepend_error(method_name, problem_mod)
           end
         else
           def allow_no_prepended_module_definition_of(_method_name)

data/lib/rspec/mocks/argument_list_matcher.rb

@@ -64,7 +64,7 @@ module RSpec
       def resolve_expected_args_based_on(actual_args)
         return [] if [ArgumentMatchers::NoArgsMatcher::INSTANCE] == expected_args
 
-        any_args_index = expected_args.index(ArgumentMatchers::AnyArgsMatcher::INSTANCE)
+        any_args_index = expected_args.index { |a| ArgumentMatchers::AnyArgsMatcher::INSTANCE == a }
         return expected_args unless any_args_index
 
         replace_any_args_with_splat_of_anything(any_args_index, actual_args.count)
@@ -81,10 +81,10 @@ module RSpec
       end
 
       def ensure_expected_args_valid!
-        if expected_args.count(ArgumentMatchers::AnyArgsMatcher::INSTANCE) > 1
+        if expected_args.count { |a| ArgumentMatchers::AnyArgsMatcher::INSTANCE == a } > 1
           raise ArgumentError, "`any_args` can only be passed to " \
                 "`with` once but you have passed it multiple times."
-        elsif expected_args.count > 1 && expected_args.include?(ArgumentMatchers::NoArgsMatcher::INSTANCE)
+        elsif expected_args.count > 1 && expected_args.any? { |a| ArgumentMatchers::NoArgsMatcher::INSTANCE == a }
           raise ArgumentError, "`no_args` can only be passed as a " \
                 "singleton argument to `with` (i.e. `with(no_args)`), " \
                 "but you have passed additional arguments."

data/lib/rspec/mocks/configuration.rb

@@ -103,17 +103,18 @@ module RSpec
       # Provides a way to perform customisations when verifying doubles.
       #
       # @example
-      #  RSpec::Mocks.configuration.when_declaring_verifying_double do |ref|
+      #  RSpec::Mocks.configuration.before_verifying_doubles do |ref|
       #    ref.some_method!
       #  end
-      def when_declaring_verifying_double(&block)
-        verifying_double_declaration_callbacks << block
+      def before_verifying_doubles(&block)
+        verifying_double_callbacks << block
       end
+      alias :when_declaring_verifying_double :before_verifying_doubles
 
       # @api private
       # Returns an array of blocks to call when verifying doubles
-      def verifying_double_declaration_callbacks
-        @verifying_double_declaration_callbacks ||= []
+      def verifying_double_callbacks
+        @verifying_double_callbacks ||= []
       end
 
       def transfer_nested_constants?

data/lib/rspec/mocks/error_generator.rb

@@ -1,4 +1,4 @@
-RSpec::Support.require_rspec_support 'differ'
+RSpec::Support.require_rspec_support "object_formatter"
 
 module RSpec
   module Mocks
@@ -36,9 +36,8 @@ module RSpec
     class ErrorGenerator
       attr_writer :opts
 
-      def initialize(target, name)
+      def initialize(target=nil)
         @target = target
-        @name = name
       end
 
       # @private
@@ -47,41 +46,26 @@ module RSpec
       end
 
       # @private
-      def raise_unexpected_message_error(message, *args)
-        __raise "#{intro} received unexpected message :#{message}#{arg_message(*args)}"
+      def raise_unexpected_message_error(message, args)
+        __raise "#{intro} received unexpected message :#{message} with #{format_args(args)}"
       end
 
       # @private
-      def raise_unexpected_message_args_error(expectation, *args)
-        expected_args = format_args(*expectation.expected_args)
-        actual_args = format_received_args(*args)
-        diff = diff_message(expectation.expected_args, args)
-
-        message = default_error_message(expectation, expected_args, actual_args)
-        message << "\nDiff:#{diff}" unless diff.empty?
-
-        __raise message
+      def raise_unexpected_message_args_error(expectation, args_for_multiple_calls, source_id=nil)
+        __raise error_message(expectation, args_for_multiple_calls), nil, source_id
       end
 
       # @private
-      def raise_missing_default_stub_error(expectation, *args)
-        expected_args = format_args(*expectation.expected_args)
-        actual_args = format_received_args(*args)
-        diff = diff_message(expectation.expected_args, args)
-
-        message = default_error_message(expectation, expected_args, actual_args)
-        message << "\nDiff:\n #{diff}" unless diff.empty?
+      def raise_missing_default_stub_error(expectation, args_for_multiple_calls)
+        message = error_message(expectation, args_for_multiple_calls)
         message << "\n Please stub a default value first if message might be received with other args as well. \n"
 
         __raise message
       end
 
       # @private
-      def raise_similar_message_args_error(expectation, *args_for_multiple_calls)
-        expected_args = format_args(*expectation.expected_args)
-        actual_args = args_for_multiple_calls.map { |a| format_received_args(*a) }.join(", ")
-
-        __raise(default_error_message(expectation, expected_args, actual_args))
+      def raise_similar_message_args_error(expectation, args_for_multiple_calls, backtrace_line=nil)
+        __raise error_message(expectation, args_for_multiple_calls), backtrace_line
       end
 
       def default_error_message(expectation, expected_args, actual_args)
@@ -95,19 +79,37 @@ module RSpec
 
       # rubocop:disable Style/ParameterLists
       # @private
-      def raise_expectation_error(message, expected_received_count, argument_list_matcher, actual_received_count, expectation_count_type, *args)
+      def raise_expectation_error(message, expected_received_count, argument_list_matcher,
+                                  actual_received_count, expectation_count_type, args,
+                                  backtrace_line=nil, source_id=nil)
         expected_part = expected_part_of_expectation_error(expected_received_count, expectation_count_type, argument_list_matcher)
-        received_part = received_part_of_expectation_error(actual_received_count, *args)
-        __raise "(#{intro}).#{message}#{format_args(*args)}\n    #{expected_part}\n    #{received_part}"
+        received_part = received_part_of_expectation_error(actual_received_count, args)
+        __raise "(#{intro(:unwrapped)}).#{message}#{format_args(args)}\n    #{expected_part}\n    #{received_part}", backtrace_line, source_id
       end
       # rubocop:enable Style/ParameterLists
 
       # @private
-      def raise_unimplemented_error(doubled_module, method_name)
-        __raise "%s does not implement: %s" % [
-          doubled_module.description,
-          method_name
-        ]
+      def raise_unimplemented_error(doubled_module, method_name, object)
+        message = case object
+                  when InstanceVerifyingDouble
+                    "the %s class does not implement the instance method: %s" <<
+                      if ObjectMethodReference.for(doubled_module, method_name).implemented?
+                        ". Perhaps you meant to use `class_double` instead?"
+                      else
+                        ""
+                      end
+                  when ClassVerifyingDouble
+                    "the %s class does not implement the class method: %s" <<
+                      if InstanceMethodReference.for(doubled_module, method_name).implemented?
+                        ". Perhaps you meant to use `instance_double` instead?"
+                      else
+                        ""
+                      end
+                  else
+                    "%s does not implement: %s"
+                  end
+
+        __raise message % [doubled_module.description, method_name]
       end
 
       # @private
@@ -132,101 +134,131 @@ module RSpec
       end
 
       # @private
-      def received_part_of_expectation_error(actual_received_count, *args)
-        "received: #{count_message(actual_received_count)}" +
-          actual_method_call_args_description(actual_received_count, args)
+      def describe_expectation(verb, message, expected_received_count, _actual_received_count, args)
+        "#{verb} #{message}#{format_args(args)} #{count_message(expected_received_count)}"
       end
 
       # @private
-      def expected_part_of_expectation_error(expected_received_count, expectation_count_type, argument_list_matcher)
-        "expected: #{count_message(expected_received_count, expectation_count_type)}" +
-          expected_method_call_args_description(argument_list_matcher.expected_args)
+      def raise_out_of_order_error(message)
+        __raise "#{intro} received :#{message} out of order"
       end
 
       # @private
-      def actual_method_call_args_description(count, args)
-        method_call_args_description(args) ||
-          if count > 0 && args.length > 0
-            " with arguments: #{args.inspect.gsub(/\A\[(.+)\]\z/, '(\1)')}"
-          else
-            ""
-          end
+      def raise_missing_block_error(args_to_yield)
+        __raise "#{intro} asked to yield |#{arg_list(args_to_yield)}| but no block was passed"
       end
 
       # @private
-      def expected_method_call_args_description(args)
-        method_call_args_description(args) ||
-          if args.length > 0
-            " with arguments: #{format_args(*args)}"
-          else
-            ""
-          end
+      def raise_wrong_arity_error(args_to_yield, signature)
+        __raise "#{intro} yielded |#{arg_list(args_to_yield)}| to block with #{signature.description}"
       end
 
       # @private
-      def method_call_args_description(args)
-        case args.first
-        when ArgumentMatchers::AnyArgsMatcher then " with any arguments"
-        when ArgumentMatchers::NoArgsMatcher  then " with no arguments"
-        end
+      def raise_only_valid_on_a_partial_double(method)
+        __raise "#{intro} is a pure test double. `#{method}` is only " \
+                "available on a partial double."
       end
 
       # @private
-      def describe_expectation(verb, message, expected_received_count, _actual_received_count, *args)
-        "#{verb} #{message}#{format_args(*args)} #{count_message(expected_received_count)}"
+      def raise_expectation_on_unstubbed_method(method)
+        __raise "#{intro} expected to have received #{method}, but that " \
+                "object is not a spy or method has not been stubbed."
       end
 
       # @private
-      def raise_out_of_order_error(message)
-        __raise "#{intro} received :#{message} out of order"
+      def raise_expectation_on_mocked_method(method)
+        __raise "#{intro} expected to have received #{method}, but that " \
+                "method has been mocked instead of stubbed or spied."
       end
 
       # @private
-      def raise_block_failed_error(message, detail)
-        __raise "#{intro} received :#{message} but passed block failed with: #{detail}"
+      def 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 raise_missing_block_error(args_to_yield)
-        __raise "#{intro} asked to yield |#{arg_list(*args_to_yield)}| but no block was passed"
+      def raise_verifying_double_not_defined_error(ref)
+        notify(VerifyingDoubleNotDefinedError.new(
+          "#{ref.description.inspect} is not a defined constant. " \
+          "Perhaps you misspelt it? " \
+          "Disable check with `verify_doubled_constant_names` configuration option."
+        ))
       end
 
       # @private
-      def raise_wrong_arity_error(args_to_yield, signature)
-        __raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with #{signature.description}"
+      def raise_have_received_disallowed(type, reason)
+        __raise "Using #{type}(...) with the `have_received` " \
+                "matcher is not supported#{reason}."
       end
 
       # @private
-      def raise_only_valid_on_a_partial_double(method)
-        __raise "#{intro} is a pure test double. `#{method}` is only " \
-                "available on a partial double."
+      def raise_cant_constrain_count_for_negated_have_received_error(count_constraint)
+        __raise "can't use #{count_constraint} when negative"
       end
 
       # @private
-      def raise_expectation_on_unstubbed_method(method)
-        __raise "#{intro} expected to have received #{method}, but that " \
-                "object is not a spy or method has not been stubbed."
+      def raise_method_not_stubbed_error(method_name)
+        __raise "The method `#{method_name}` was not stubbed or was already unstubbed"
       end
 
       # @private
-      def raise_expectation_on_mocked_method(method)
-        __raise "#{intro} expected to have received #{method}, but that " \
-                "method has been mocked instead of stubbed or spied."
-      end
+      def raise_already_invoked_error(message, calling_customization)
+        error_message = "The message expectation for #{intro}.#{message} has already been invoked " \
+          "and cannot be modified further (e.g. using `#{calling_customization}`). All message expectation " \
+          "customizations must be applied before it is used for the first time."
 
-      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?"
+        notify MockExpectationAlreadyInvokedError.new(error_message)
       end
 
     private
 
+      def received_part_of_expectation_error(actual_received_count, args)
+        "received: #{count_message(actual_received_count)}" +
+          method_call_args_description(args) do
+            actual_received_count > 0 && args.length > 0
+          end
+      end
+
+      def expected_part_of_expectation_error(expected_received_count, expectation_count_type, argument_list_matcher)
+        "expected: #{count_message(expected_received_count, expectation_count_type)}" +
+          method_call_args_description(argument_list_matcher.expected_args) do
+            argument_list_matcher.expected_args.length > 0
+          end
+      end
+
+      def method_call_args_description(args)
+        case args.first
+        when ArgumentMatchers::AnyArgsMatcher then " with any arguments"
+        when ArgumentMatchers::NoArgsMatcher  then " with no arguments"
+        else
+          if yield
+            " with arguments: #{format_args(args)}"
+          else
+            ""
+          end
+        end
+      end
+
       def unexpected_arguments_message(expected_args_string, actual_args_string)
         "with unexpected arguments\n  expected: #{expected_args_string}\n       got: #{actual_args_string}"
       end
 
+      def error_message(expectation, args_for_multiple_calls)
+        expected_args = format_args(expectation.expected_args)
+        actual_args = format_received_args(args_for_multiple_calls)
+        message = default_error_message(expectation, expected_args, actual_args)
+
+        if args_for_multiple_calls.one?
+          diff = diff_message(expectation.expected_args, args_for_multiple_calls.first)
+          message << "\nDiff:#{diff}" unless diff.strip.empty?
+        end
+
+        message
+      end
+
       def diff_message(expected_args, actual_args)
         formatted_expected_args = expected_args.map do |x|
           RSpec::Support.rspec_description_for_object(x)
@@ -253,47 +285,54 @@ module RSpec
         RSpec::Support::Differ.new(:color => RSpec::Mocks.configuration.color?)
       end
 
-      def intro
-        if @name
-          "Double #{@name.inspect}"
-        elsif TestDouble === @target
-          "Double"
-        elsif Class === @target
-          "<#{@target.inspect} (class)>"
-        elsif @target
-          @target
-        else
-          "nil"
+      def intro(unwrapped=false)
+        case @target
+        when TestDouble then TestDoubleFormatter.format(@target, unwrapped)
+        when Class then
+          formatted = "#{@target.inspect} (class)"
+          return formatted if unwrapped
+          "#<#{formatted}>"
+        when NilClass then "nil"
+        else @target
         end
       end
 
-      def __raise(message)
+      def __raise(message, backtrace_line=nil, source_id=nil)
         message = opts[:message] unless opts[:message].nil?
-        Kernel.raise(RSpec::Mocks::MockExpectationError, message)
+        exception = RSpec::Mocks::MockExpectationError.new(message)
+        prepend_to_backtrace(exception, backtrace_line) if backtrace_line
+        notify exception, :source_id => source_id
       end
 
-      def arg_message(*args)
-        " with " + format_args(*args)
-      end
-
-      def format_args(*args)
-        args.empty? ? "(no args)" : "(" + arg_list(*args) + ")"
+      if RSpec::Support::Ruby.jruby?
+        def prepend_to_backtrace(exception, line)
+          raise exception
+        rescue RSpec::Mocks::MockExpectationError => with_backtrace
+          with_backtrace.backtrace.unshift(line)
+        end
+      else
+        def prepend_to_backtrace(exception, line)
+          exception.set_backtrace(caller.unshift line)
+        end
       end
 
-      def arg_list(*args)
-        args.map { |arg| arg_has_valid_description?(arg) ? arg.description : arg.inspect }.join(", ")
+      def notify(*args)
+        RSpec::Support.notify_failure(*args)
       end
 
-      def arg_has_valid_description?(arg)
-        RSpec::Support.is_a_matcher?(arg) && arg.respond_to?(:description)
+      def format_args(args)
+        return "(no args)" if args.empty?
+        "(#{arg_list(args)})"
       end
 
-      def format_received_args(*args)
-        args.empty? ? "(no args)" : "(" + received_arg_list(*args) + ")"
+      def arg_list(args)
+        args.map { |arg| RSpec::Support::ObjectFormatter.format(arg) }.join(", ")
       end
 
-      def received_arg_list(*args)
-        args.map(&:inspect).join(", ")
+      def format_received_args(args_for_multiple_calls)
+        grouped_args(args_for_multiple_calls).map do |args_for_one_call, index|
+          "#{format_args(args_for_one_call)}#{group_count(index, args_for_multiple_calls)}"
+        end.join("\n            ")
       end
 
       def count_message(count, expectation_count_type=nil)
@@ -305,6 +344,19 @@ module RSpec
       def times(count)
         "#{count} time#{count == 1 ? '' : 's'}"
       end
+
+      def grouped_args(args)
+        Hash[args.group_by { |x| x }.map { |k, v| [k, v.count] }]
+      end
+
+      def group_count(index, args)
+        " (#{times(index)})" if args.size > 1 || index > 1
+      end
+    end
+
+    # @private
+    def self.error_generator
+      @error_generator ||= ErrorGenerator.new
     end
   end
 end