rspec-mocks 3.6.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0194543e201f9d8cb6c477dcdeaf678b3f5ce442
-  data.tar.gz: bd1e7cae196ec0d61c4dd714c4371b27e3d8c9f1
+SHA256:
+  metadata.gz: f53d2fe5ab69778d6528b80a08aaa48869a527c5185f715671c0d48beecf5db4
+  data.tar.gz: 8e06d4be6fbc3dec6cbbdf75d141638db33653579fcd95b4869cb41b97afb4e8
 SHA512:
-  metadata.gz: 13bfadb0ccb5f89efaa761ab93de080a4d9da94568965e55b03c53e104fb57ec283311e4395ecdb497fcff11f648b6649daaf117b1e486eced3040b1b8b04268
-  data.tar.gz: 627998b4615c8de8e236ac46788da589e9f16acbcfe75d310af7119dff3ee69a0e1eb2981b9947e2b102d546a0c5b2fd06780fc191fb3b2362b102dbb16dc400
+  metadata.gz: 6863b589a173e3985263e2b49c797389e7db68912df5f6f294f23833d66cbeb72b10b9b800cca08383322f1b1775b99f7514878663b715b48d4d6e39582b4836
+  data.tar.gz: 320ec537f1f7708bd0fb5317ab3878cb569f2a9dbd676b8b8512f36ece73f5efc0d9f7d85bb8b6b30ac145cc5ff3f10d13212897c19e6559a475526703325e1d

data/Changelog.md

@@ -1,3 +1,54 @@
+### 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)
+
+Bug Fixes:
+
+* Ensure stubbing methods does not change their visibility.
+  (Kevin Boschert, #1277)
+
+### 3.8.0 / 2018-08-04
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.7.0...v3.8.0)
+
+Bug Fixes:
+
+* Issue error when encountering invalid "counted" negative message expectations.
+  (Sergiy Yarinovskiy, #1212)
+* Ensure `allow_any_instance_of` and `expect_any_instance_of` can be temporarily
+  supressed. (Jon Rowe, #1228)
+* Ensure `expect_any_instance_of(double).to_not have_received(:some_method)`
+  fails gracefully (as its not supported) rather than issuing a `NoMethodError`.
+  (Maxim Krizhanovsky, #1231)
+
+### 3.7.0 / 2017-10-17
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.6.0...v3.7.0)
+
+Enhancements:
+
+* Improve compatibility with `--enable-frozen-string-literal` option
+  on Ruby 2.3+. (Pat Allan, #1165)
+
+Bug Fixes:
+
+* Fix `hash_including` and `hash_excluding` so that they work against
+  subclasses of `Hash`. (Aaron Rosenberg, #1167)
+
 ### 3.6.0 / 2017-05-04
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.6.0.beta2...v3.6.0)
 
@@ -880,7 +931,8 @@ Bug fixes
 * Fix `should_receive` so that when it is called on an `as_null_object`
   double with no implementation, and there is a previous explicit stub
   for the same method, the explicit stub remains (rather than being
-  overriden with the null object implementation--`return self`). (Myron Marston)
+  overridden with the null object implementation--`return self`). (Myron
+  Marston)
 
 ### 2.11.0 / 2012-07-07
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v2.10.1...v2.11.0)

data/README.md

@@ -13,7 +13,7 @@ RSpec repos as well. Add the following to your `Gemfile`:
 
 ```ruby
 %w[rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
-  gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
+  gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
 end
 ```
 ## Contributing
@@ -257,7 +257,7 @@ expect(double).to receive(:msg).with("B", 2, 4)
 ## Argument Matchers
 
 Arguments that are passed to `with` are compared with actual arguments
-received using ==. In cases in which you want to specify things about the
+received using ===. In cases in which you want to specify things about the
 arguments rather than the arguments themselves, you can use any of the
 matchers that ship with rspec-expectations. They don't all make syntactic
 sense (they were primarily designed for use with RSpec::Expectations), but
@@ -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/recorder.rb

@@ -242,7 +242,7 @@ module RSpec
         def observe!(method_name)
           allow_no_prepended_module_definition_of(method_name)
 
-          if RSpec::Mocks.configuration.verify_partial_doubles?
+          if RSpec::Mocks.configuration.verify_partial_doubles? && !Mocks.configuration.temporarily_suppress_partial_double_verification
             unless public_protected_or_private_method_defined?(method_name)
               AnyInstance.error_generator.raise_does_not_implement_error(@klass, method_name)
             end

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

@@ -25,7 +25,7 @@ module RSpec
           stub
         end
 
-        InovcationOrder =
+        InvocationOrder =
           {
             :and_return => [:with, nil],
             :and_raise => [:with, nil],
@@ -38,7 +38,7 @@ module RSpec
         EmptyInvocationOrder = {}.freeze
 
         def invocation_order
-          InovcationOrder
+          InvocationOrder
         end
 
         def verify_invocation_order(rspec_method_name, *_args, &_block)

data/lib/rspec/mocks/argument_matchers.rb

@@ -116,7 +116,7 @@ module RSpec
 
       # @private
       def self.anythingize_lonely_keys(*args)
-        hash = args.last.class == Hash ? args.delete_at(-1) : {}
+        hash = Hash === args.last ? args.delete_at(-1) : {}
         args.each { | arg | hash[arg] = AnyArgMatcher::INSTANCE }
         hash
       end
@@ -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

@@ -57,10 +57,10 @@ module RSpec
 
       # @private
       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
+        __raise(
+          error_message(expectation, args_for_multiple_calls) +
+          "\n Please stub a default value first if message might be received with other args as well. \n"
+        )
       end
 
       # @private
@@ -69,10 +69,10 @@ module RSpec
       end
 
       def default_error_message(expectation, expected_args, actual_args)
-        "#{intro} received #{expectation.message.inspect} #{unexpected_arguments_message(expected_args, actual_args)}"
+        "#{intro} received #{expectation.message.inspect} #{unexpected_arguments_message(expected_args, actual_args)}".dup
       end
 
-      # rubocop:disable Style/ParameterLists
+      # rubocop:disable Metrics/ParameterLists
       # @private
       def raise_expectation_error(message, expected_received_count, argument_list_matcher,
                                   actual_received_count, expectation_count_type, args,
@@ -81,20 +81,20 @@ module RSpec
         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
+      # rubocop:enable Metrics/ParameterLists
 
       # @private
       def raise_unimplemented_error(doubled_module, method_name, object)
         message = case object
                   when InstanceVerifyingDouble
-                    "the %s class does not implement the instance method: %s" <<
+                    "the %s class does not implement the instance method: %s".dup <<
                       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" <<
+                    "the %s class does not implement the class method: %s".dup <<
                       if InstanceMethodReference.for(doubled_module, method_name).implemented?
                         ". Perhaps you meant to use `instance_double` instead?"
                       else

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]
 
@@ -76,6 +76,10 @@ module RSpec
           disallow("expect_any_instance_of")
         end
 
+        def setup_any_instance_negative_expectation(_subject, &_block)
+          disallow("expect_any_instance_of")
+        end
+
       private
 
         def disallow(type, reason="")

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
@@ -367,7 +371,7 @@ module RSpec
         # @private
         attr_reader :type
 
-        # rubocop:disable Style/ParameterLists
+        # rubocop:disable Metrics/ParameterLists
         def initialize(error_generator, expectation_ordering, expected_from, method_double,
                        type=:expectation, opts={}, &implementation_block)
           @type = type
@@ -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
@@ -395,7 +400,7 @@ module RSpec
           @implementation = Implementation.new
           self.inner_implementation_action = implementation_block
         end
-        # rubocop:enable Style/ParameterLists
+        # rubocop:enable Metrics/ParameterLists
 
         def expected_args
           @argument_list_matcher.expected_args
@@ -536,7 +541,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
@@ -567,7 +574,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?
@@ -581,6 +590,7 @@ module RSpec
         end
 
         def set_expected_received_count(relativity, n)
+          raise "`count` is not supported with negative message expectations" if negative?
           @at_least = (relativity == :at_least)
           @at_most  = (relativity == :at_most)
           @exactly  = (relativity == :exactly)
@@ -625,6 +635,7 @@ module RSpec
           nil
         end
       end
+      # rubocop:enable Metrics/ModuleLength
 
       include ImplementationDetails
     end
@@ -650,7 +661,7 @@ module RSpec
             @error_generator.raise_wrong_arity_error(args, block_signature)
           end
 
-          value = @eval_context ? @eval_context.instance_exec(*args, &block) : block.call(*args)
+          value = @eval_context ? @eval_context.instance_exec(*args, &block) : yield(*args)
         end
         value
       end

data/lib/rspec/mocks/method_double.rb

@@ -59,7 +59,7 @@ module RSpec
         return if @method_is_proxied
 
         save_original_implementation_callable!
-        definition_target.class_exec(self, method_name, visibility) do |method_double, method_name, visibility|
+        definition_target.class_exec(self, method_name, @original_visibility || visibility) do |method_double, method_name, visibility|
           define_method(method_name) do |*args, &block|
             method_double.proxy_method_invoked(self, *args, &block)
           end

data/lib/rspec/mocks/method_reference.rb

@@ -64,14 +64,6 @@ module RSpec
         :public
       end
 
-    private
-
-      def original_method
-        @object_reference.when_loaded do |m|
-          self.defined? && find_method(m)
-        end
-      end
-
       def self.instance_method_visibility_for(klass, method_name)
         if klass.public_method_defined?(method_name)
           :public
@@ -107,6 +99,14 @@ module RSpec
 
         return :public if visible
       end
+
+    private
+
+      def original_method
+        @object_reference.when_loaded do |m|
+          self.defined? && find_method(m)
+        end
+      end
     end
 
     # @private

data/lib/rspec/mocks/proxy.rb

@@ -2,12 +2,18 @@ module RSpec
   module Mocks
     # @private
     class Proxy
+      # @private
       SpecificMessage = Struct.new(:object, :message, :args) do
         def ==(expectation)
           expectation.orig_object == object && expectation.matches?(message, *args)
         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.
@@ -19,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) }
@@ -89,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
@@ -140,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
@@ -161,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

@@ -44,7 +44,7 @@ module RSpec
 
       # @private
       def to_s
-        inspect.gsub('<', '[').gsub('>', ']')
+        inspect.tr('<', '[').tr('>', ']')
       end
 
       # @private

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.6.0'
+      STRING = '3.9.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,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
@@ -192,7 +192,12 @@ files:
 homepage: https://github.com/rspec/rspec-mocks
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rspec/rspec-mocks/issues
+  changelog_uri: https://github.com/rspec/rspec-mocks/blob/v3.9.0/Changelog.md
+  documentation_uri: https://rspec.info/documentation/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
+  source_code_uri: https://github.com/rspec/rspec-mocks
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -209,10 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.6.0
+summary: rspec-mocks-3.9.0
 test_files: []
-has_rdoc: