rspec-mocks-diag 3.8.1.2 → 3.9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cabd49758a2f5b8020f328ab1105cc85886cda2739117cd2015961e2be8d439c
-  data.tar.gz: c2f58dbff88f7bbebbf1a950f6b3bb47ba42378bbafa45f722f65d523a04b599
+  metadata.gz: 8be35928033a695ee980bc47fffc4e52e3bfaae18bece60c4fdb928ae49d28b0
+  data.tar.gz: 8a477839418aab6661b7eb23bd150f08ece8015a98b641b2387e2e4582f6b52d
 SHA512:
-  metadata.gz: ad6f5c38c0a79a3fa75dbaaf721d7ceeb85d7a23be1e52198f76343fd4e48cc7ab32682bc9964cd290a23754e70ac847325758f26ef73b0350a0c18fe1dded91
-  data.tar.gz: 72a03fa13751b377146bc4186c604f3e32657292f787d20b14f4ef5270249ff5510302f14cf221b127b0f2ce4313dfe4ec1bad98054a1e18667c199b927e521e
+  metadata.gz: 222f5305d179ae0c5326badad390c06121c47cf143984501b7cbd3d8e7e1c15a7d255d92c0cb26716709e32d92896e0dda9c5eb6cb006c0a7f24f0fe2e2829f3
+  data.tar.gz: 3c790d7f0b638fff260179b35f931bf6c28951a0a0faef3797dfc2a78b66fffe086af30cd6d379ea758ad2fcc7ed10728ff7bffea06136bc5614973f78384e95

data/Changelog.md

@@ -1,3 +1,28 @@
+### 3.9.1 / 2019-12-31
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.9.0...v3.9.1)
+
+Bug Fixes:
+
+* Trigger `RSpec::Mocks.configuration.verifying_double_callbacks` when using
+  `allow_any_instance_of` or `expect_any_instance_of` (Daniel Orner, #1309)
+
+### 3.9.0 / 2019-10-07
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.8.2...v3.9.0)
+
+Enhancements:
+
+* Improve thread safety of message expectations by using Mutex to prevent
+  deadlocking errors. (Ry Biesemeyer, #1236)
+* Add the ability to use `time` as an alias for `times`. For example:
+  `expect(Class).to receive(:method).exactly(1).time`.
+  (Pistos, Benoit Tigeot, #1271)
+
+### 3.8.2 / 2019-10-02
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.8.1...v3.8.2)
+
+* Allow `array_including` argument matchers to be nested.
+  (Emmanuel Delmas, #1291)
+
 ### 3.8.1 / 2019-06-13
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.8.0...v3.8.1)
 

data/README.md

@@ -285,12 +285,15 @@ expect(double).to receive(:msg).with(hash_excluding(:a => 5)) # first arg is a h
 ```ruby
 expect(double).to receive(:msg).once
 expect(double).to receive(:msg).twice
+expect(double).to receive(:msg).exactly(n).time
 expect(double).to receive(:msg).exactly(n).times
 expect(double).to receive(:msg).at_least(:once)
 expect(double).to receive(:msg).at_least(:twice)
+expect(double).to receive(:msg).at_least(n).time
 expect(double).to receive(:msg).at_least(n).times
 expect(double).to receive(:msg).at_most(:once)
 expect(double).to receive(:msg).at_most(:twice)
+expect(double).to receive(:msg).at_most(n).time
 expect(double).to receive(:msg).at_most(n).times
 ```
 
@@ -327,7 +330,7 @@ expect(double).to receive(:msg).and_return(value)
 expect(double).to receive(:msg).exactly(3).times.and_return(value1, value2, value3)
   # returns value1 the first time, value2 the second, etc
 expect(double).to receive(:msg).and_raise(error)
-  # error can be an instantiated object or a class
+  # `error` can be an instantiated object (e.g. `StandardError.new(some_arg)`) or a class (e.g. `StandardError`)
   # if it is a class, it must be instantiable with no args
 expect(double).to receive(:msg).and_throw(:msg)
 expect(double).to receive(:msg).and_yield(values, to, yield)

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

@@ -41,6 +41,7 @@ module RSpec
           record :thrice
           record :exactly
           record :times
+          record :time
           record :never
           record :at_least
           record :at_most

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

@@ -12,17 +12,9 @@ module RSpec
           __raise "#{klass} does not implement ##{method_name}"
         end
 
-        def raise_message_already_received_by_other_instance_error(method_name, object_inspect, invoked_instance, invoked_backtrace)
-          begin
-            raise RuntimeError
-          rescue => e
-            backtrace = e.backtrace
-          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}.\nCurrent backtrace:\n" +
-                  backtrace.map { |line| '  ' + line }.join("\n") +
-                  "\nPrevious backtrace: \n" +
-                  invoked_backtrace.map { |line| '  ' + line }.join("\n")
+                  "but has already been received by #{invoked_instance}"
         end
 
         def raise_not_supported_with_prepend_error(method_name, problem_mod)

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

@@ -21,6 +21,11 @@ module RSpec
           @backed_up_method_owner = {}
           @klass = klass
           @expectation_set = false
+
+          return unless RSpec::Mocks.configuration.verify_partial_doubles?
+          RSpec::Mocks.configuration.verifying_double_callbacks.each do |block|
+            block.call(ObjectReference.for(klass))
+          end
         end
 
         # Initializes the recording a stub to be played back against any
@@ -261,16 +266,11 @@ module RSpec
         def mark_invoked!(method_name)
           backup_method!(method_name)
           recorder = self
-          begin
-            raise RuntimeError
-          rescue => e
-            invoked_backtrace = e.backtrace
-          end
           @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(', ')}>"
             AnyInstance.error_generator.raise_message_already_received_by_other_instance_error(
-              method_name, inspect, invoked_instance, invoked_backtrace
+              method_name, inspect, invoked_instance
             )
           end
         end

data/lib/rspec/mocks/argument_matchers.rb

@@ -241,6 +241,8 @@ module RSpec
               RSpec::Support::FuzzyMatcher.values_match?(expected_element, actual_element)
             end
           end
+        rescue NoMethodError
+          false
         end
 
         def description

data/lib/rspec/mocks/error_generator.rb

@@ -47,7 +47,7 @@ module RSpec
 
       # @private
       def raise_unexpected_message_error(message, args)
-        __raise "#{intro} received unexpected message :#{message} with #{format_args(args)}\nDouble instantiated from:\n#{@target._rspec_backtrace.map { |line| '  ' + line }.join("\n")}"
+        __raise "#{intro} received unexpected message :#{message} with #{format_args(args)}"
       end
 
       # @private

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

@@ -5,7 +5,7 @@ module RSpec
       class HaveReceived
         include Matcher
 
-        COUNT_CONSTRAINTS = %w[exactly at_least at_most times once twice thrice]
+        COUNT_CONSTRAINTS = %w[exactly at_least at_most times time once twice thrice]
         ARGS_CONSTRAINTS = %w[with]
         CONSTRAINTS = COUNT_CONSTRAINTS + ARGS_CONSTRAINTS + %w[ordered]
 

data/lib/rspec/mocks/message_expectation.rb

@@ -1,3 +1,5 @@
+RSpec::Support.require_rspec_support 'mutex'
+
 module RSpec
   module Mocks
     # A message expectation that only allows concrete return values to be set
@@ -236,6 +238,7 @@ module RSpec
         self.inner_implementation_action = block
         self
       end
+      alias time times
 
       # Expect a message not to be received at all.
       #
@@ -357,6 +360,7 @@ module RSpec
       # some collaborators it delegates to for this stuff but for now this was
       # the simplest way to split the public from private stuff to make it
       # easier to publish the docs for the APIs we want published.
+      # rubocop:disable Metrics/ModuleLength
       module ImplementationDetails
         attr_accessor :error_generator, :implementation
         attr_reader :message
@@ -378,6 +382,7 @@ module RSpec
           @orig_object = @method_double.object
           @message = @method_double.method_name
           @actual_received_count = 0
+          @actual_received_count_write_mutex = Support::Mutex.new
           @expected_received_count = type == :expectation ? 1 : :any
           @argument_list_matcher = ArgumentListMatcher::MATCH_ALL
           @order_group = expectation_ordering
@@ -543,7 +548,9 @@ module RSpec
         end
 
         def increase_actual_received_count!
-          @actual_received_count += 1
+          @actual_received_count_write_mutex.synchronize do
+            @actual_received_count += 1
+          end
         end
 
       private
@@ -574,7 +581,9 @@ module RSpec
             parent_stub.invoke(nil, *args, &block)
           end
         ensure
-          @actual_received_count += increment
+          @actual_received_count_write_mutex.synchronize do
+            @actual_received_count += increment
+          end
         end
 
         def has_been_invoked?
@@ -633,6 +642,7 @@ module RSpec
           nil
         end
       end
+      # rubocop:enable Metrics/ModuleLength
 
       include ImplementationDetails
     end

data/lib/rspec/mocks/proxy.rb

@@ -9,6 +9,11 @@ module RSpec
         end
       end
 
+      unless defined?(Mutex)
+        Support.require_rspec_support 'mutex'
+        Mutex = Support::Mutex
+      end
+
       # @private
       def ensure_implemented(*_args)
         # noop for basic proxies, see VerifyingProxy for behaviour.
@@ -20,6 +25,7 @@ module RSpec
         @order_group = order_group
         @error_generator = ErrorGenerator.new(object)
         @messages_received = []
+        @messages_received_mutex = Mutex.new
         @options = options
         @null_object = false
         @method_doubles = Hash.new { |h, k| h[k] = MethodDouble.new(@object, k, self) }
@@ -90,27 +96,31 @@ module RSpec
           @error_generator.raise_expectation_on_unstubbed_method(expected_method_name)
         end
 
-        @messages_received.each do |(actual_method_name, args, received_block)|
-          next unless expectation.matches?(actual_method_name, *args)
+        @messages_received_mutex.synchronize do
+          @messages_received.each do |(actual_method_name, args, received_block)|
+            next unless expectation.matches?(actual_method_name, *args)
 
-          expectation.safe_invoke(nil)
-          block.call(*args, &received_block) if block
+            expectation.safe_invoke(nil)
+            block.call(*args, &received_block) if block
+          end
         end
       end
 
       # @private
       def check_for_unexpected_arguments(expectation)
-        return if @messages_received.empty?
+        @messages_received_mutex.synchronize do
+          return if @messages_received.empty?
 
-        return if @messages_received.any? { |method_name, args, _| expectation.matches?(method_name, *args) }
+          return if @messages_received.any? { |method_name, args, _| expectation.matches?(method_name, *args) }
 
-        name_but_not_args, others = @messages_received.partition do |(method_name, args, _)|
-          expectation.matches_name_but_not_args(method_name, *args)
-        end
+          name_but_not_args, others = @messages_received.partition do |(method_name, args, _)|
+            expectation.matches_name_but_not_args(method_name, *args)
+          end
 
-        return if name_but_not_args.empty? && !others.empty?
+          return if name_but_not_args.empty? && !others.empty?
 
-        expectation.raise_unexpected_message_args_error(name_but_not_args.map { |args| args[1] })
+          expectation.raise_unexpected_message_args_error(name_but_not_args.map { |args| args[1] })
+        end
       end
 
       # @private
@@ -141,17 +151,23 @@ module RSpec
 
       # @private
       def reset
-        @messages_received.clear
+        @messages_received_mutex.synchronize do
+          @messages_received.clear
+        end
       end
 
       # @private
       def received_message?(method_name, *args, &block)
-        @messages_received.any? { |array| array == [method_name, args, block] }
+        @messages_received_mutex.synchronize do
+          @messages_received.any? { |array| array == [method_name, args, block] }
+        end
       end
 
       # @private
       def messages_arg_list
-        @messages_received.map { |_, args, _| args }
+        @messages_received_mutex.synchronize do
+          @messages_received.map { |_, args, _| args }
+        end
       end
 
       # @private
@@ -162,7 +178,9 @@ module RSpec
       # @private
       def record_message_received(message, *args, &block)
         @order_group.invoked SpecificMessage.new(object, message, args)
-        @messages_received << [message, args, block]
+        @messages_received_mutex.synchronize do
+          @messages_received << [message, args, block]
+        end
       end
 
       # @private

data/lib/rspec/mocks/test_double.rb

@@ -15,18 +15,8 @@ module RSpec
           @name = name
         end
         assign_stubs(stubs)
-
-        begin
-          raise RuntimeError
-        rescue => e
-          @_rspec_backtrace = e.backtrace.dup.tap do |bt|
-            bt.shift
-          end
-        end
       end
 
-      attr_reader :_rspec_backtrace
-
       # Tells the object to respond to all messages. If specific stub values
       # are declared, they'll work as expected. If not, the receiver is
       # returned.

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.8.1.2'
+      STRING = '3.9.1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks-diag
 version: !ruby/object:Gem::Version
-  version: 3.8.1.2
+  version: 3.9.1.1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.14.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/p-mongo/rspec-mocks/issues
-  changelog_uri: https://github.com/p-mongo/rspec-mocks/blob/v3.8.1.2/Changelog.md
+  changelog_uri: https://github.com/p-mongo/rspec-mocks/blob/v3.9.1.1/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/p-mongo/rspec-mocks
@@ -179,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.8.1.2
+summary: rspec-mocks-3.9.1.1
 test_files: []