rspec-mocks 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 159a6b84817d3fe5b931c2fa0158a88ac84ab6d5
-  data.tar.gz: c9b42659f94d5814fc4aeb107954eb15763a9e93
+  metadata.gz: e618d7a28b9f934cf906f40a9d1c70d59833ac36
+  data.tar.gz: 6e4a6af3c8ad439a596350088869b5cd2dd69885
 SHA512:
-  metadata.gz: f0f3c1c4ec0ebd3efbbf608c3c749f1af4354aa78264c0738241a8585d4c8b170508ead0da894f2808fb1c43d692b1d7a910744b95ce20f4c3f1c2f7e8ef2d4e
-  data.tar.gz: 52b08792990f741a014390e5886fe49226b7c22ca90db1e01e0b26728571020702ce37d6b635a3df87635275b4c05606dfbd475b68120c7664fade2a86a20d86
+  metadata.gz: e14baa4517cc30d218b50b8bc4b3bfaa2a878504e4de3bb90c1a6f36db05d742f5d7f5c561c732031c932d4c27fbc2cc67fd471992e6ca50c3c13219d26c6c60
+  data.tar.gz: bfe1b8654f29fc1f891e23ec4efadd1f10c1411b166fe66e0889d6336cee57d4f2ddbb7bf5becc9d0b5f6a47915d9d1fe1fc86abae394e70b9308aa8cabbe3f2

data/.document

@@ -1,5 +1,5 @@
 lib/**/*.rb
 -
 README.md
-License.txt
+LICENSE.md
 Changelog.md

data/.yardopts

@@ -3,4 +3,4 @@
 --markup markdown
 -
 Changelog.md
-License.txt
+LICENSE.md

data/Changelog.md

@@ -1,3 +1,22 @@
+### 3.4.0 / 2015-11-11
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.3.2...v3.4.0)
+
+Enhancements:
+
+* Make `expect(...).to have_received` work without relying upon
+  rspec-expectations. (Myron Marston, #978)
+* Add option for failing tests when expectations are set on `nil`.
+  (Liz Rush, #983)
+
+Bug Fixes:
+
+* Fix `have_received { ... }` so that any block passed when the message
+  was received is forwarded to the `have_received` block. (Myron Marston, #1006)
+* Fix infinite loop in error generator when stubbing `respond_to?`.
+  (Alex Dowad, #1022)
+* Fix issue with using `receive` on subclasses (at a class level) with 1.8.7.
+  (Alex Dowad, #1026)
+
 ### 3.3.2 / 2015-07-15
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.3.1...v3.3.2)
 

data/{License.txt → LICENSE.md}

@@ -1,8 +1,9 @@
-(The MIT License)
+The MIT License (MIT)
+=====================
 
-Copyright (c) 2012 David Chelimsky, Myron Marston
-Copyright (c) 2006 David Chelimsky, The RSpec Development Team
-Copyright (c) 2005 Steven Baker
+* Copyright © 2012 David Chelimsky, Myron Marston
+* Copyright © 2006 David Chelimsky, The RSpec Development Team
+* Copyright © 2005 Steven Baker
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -16,6 +16,20 @@ RSpec repos as well. Add the following to your `Gemfile`:
   gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
 end
 ```
+## Contributing
+
+Once you've set up the environment, you'll need to cd into the working
+directory of whichever repo you want to work in. From there you can run the
+specs and cucumber features, and make patches.
+
+NOTE: You do not need to use rspec-dev to work on a specific RSpec repo. You
+can treat each RSpec repo as an independent project.
+
+For information about contributing to RSpec, please refer to the following markdown files:
+* [Build details](BUILD_DETAIL.md)
+* [Code of Conduct](CODE_OF_CONDUCT.md)
+* [Detailed contributing guide](CONTRIBUTING.md)
+* [Development setup guide](DEVELOPMENT.md)
 
 ## Test Doubles
 
@@ -346,7 +360,7 @@ end
 ## Delegating to the Original Implementation
 
 When working with a partial mock object, you may occasionally
-want to set a message expecation without interfering with how
+want to set a message expectation without interfering with how
 the object responds to the message. You can use `and_call_original`
 to achieve this:
 
@@ -425,6 +439,7 @@ you are interested in learning more, here is some recommended reading:
 
 ## Also see
 
-* [http://github.com/rspec/rspec](http://github.com/rspec/rspec)
-* [http://github.com/rspec/rspec-core](http://github.com/rspec/rspec-core)
-* [http://github.com/rspec/rspec-expectations](http://github.com/rspec/rspec-expectations)
+* [https://github.com/rspec/rspec](https://github.com/rspec/rspec)
+* [https://github.com/rspec/rspec-core](https://github.com/rspec/rspec-core)
+* [https://github.com/rspec/rspec-expectations](https://github.com/rspec/rspec-expectations)
+* [https://github.com/rspec/rspec-rails](https://github.com/rspec/rspec-rails)

data/lib/rspec/mocks/configuration.rb

@@ -3,12 +3,29 @@ module RSpec
     # Provides configuration options for rspec-mocks.
     class Configuration
       def initialize
+        @allow_message_expectations_on_nil = nil
         @yield_receiver_to_any_instance_implementation_blocks = true
         @verify_doubled_constant_names = false
         @transfer_nested_constants = false
         @verify_partial_doubles = false
       end
 
+      # Sets whether RSpec will warn, ignore, or fail a test when
+      # expectations are set on nil.
+      # By default, when this flag is not set, warning messages are issued when
+      # expectations are set on nil. This is to prevent false-positives and to
+      # catch potential bugs early on.
+      # When set to `true`, warning messages are suppressed.
+      # When set to `false`, it will raise an error.
+      #
+      # @example
+      #   RSpec.configure do |config|
+      #     config.mock_with :rspec do |mocks|
+      #       mocks.allow_message_expectations_on_nil = false
+      #     end
+      #   end
+      attr_accessor :allow_message_expectations_on_nil
+
       def yield_receiver_to_any_instance_implementation_blocks?
         @yield_receiver_to_any_instance_implementation_blocks
       end

data/lib/rspec/mocks/error_generator.rb

@@ -69,12 +69,7 @@ module RSpec
       end
 
       def default_error_message(expectation, expected_args, actual_args)
-        [
-          intro,
-          "received",
-          expectation.message.inspect,
-          unexpected_arguments_message(expected_args, actual_args),
-        ].join(" ")
+        "#{intro} received #{expectation.message.inspect} #{unexpected_arguments_message(expected_args, actual_args)}"
       end
 
       # rubocop:disable Style/ParameterLists
@@ -213,6 +208,16 @@ module RSpec
         notify MockExpectationAlreadyInvokedError.new(error_message)
       end
 
+      def raise_expectation_on_nil_error(method_name)
+        __raise expectation_on_nil_message(method_name)
+      end
+
+      def expectation_on_nil_message(method_name)
+        "An expectation of `:#{method_name}` was set on `nil`. " \
+        "To allow expectations on `nil` and suppress this message, set `config.allow_expectations_on_nil` to `true`. " \
+        "To disallow expectations on `nil`, set `config.allow_expectations_on_nil` to `false`"
+      end
+
     private
 
       def received_part_of_expectation_error(actual_received_count, args)

data/lib/rspec/mocks/example_methods.rb

@@ -197,6 +197,7 @@ module RSpec
       # By default warning messages are issued when expectations are set on
       # nil.  This is to prevent false-positives and to catch potential bugs
       # early on.
+      # @deprecated Use {RSpec::Mocks::Configuration#allow_message_expectations_on_nil} instead.
       def allow_message_expectations_on_nil
         RSpec::Mocks.space.proxy_for(nil).warn_about_expectations = false
       end

data/lib/rspec/mocks/instance_method_stasher.rb

@@ -31,7 +31,6 @@ module RSpec
         def stashed_method_name
           "obfuscated_by_rspec_mocks__#{@method}"
         end
-        private :stashed_method_name
 
         # @private
         def restore

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

@@ -36,11 +36,11 @@ module RSpec
         end
 
         def failure_message
-          generate_failure_message
+          capture_failure_message
         end
 
         def failure_message_when_negated
-          generate_failure_message
+          capture_failure_message
         end
 
         def description
@@ -54,6 +54,14 @@ module RSpec
           end
         end
 
+        def setup_expectation(subject, &block)
+          notify_failure_message unless matches?(subject, &block)
+        end
+
+        def setup_negative_expectation(subject, &block)
+          notify_failure_message unless does_not_match?(subject, &block)
+        end
+
         def setup_allowance(_subject, &_block)
           disallow("allow", " as it would have no effect")
         end
@@ -95,13 +103,17 @@ module RSpec
           end
         end
 
-        def generate_failure_message
+        def capture_failure_message
           RSpec::Support.with_failure_notifier(Proc.new { |err, _opt| return err.message }) do
-            mock_proxy.check_for_unexpected_arguments(@expectation)
-            @expectation.generate_error
+            notify_failure_message
           end
         end
 
+        def notify_failure_message
+          mock_proxy.check_for_unexpected_arguments(@expectation)
+          @expectation.generate_error
+        end
+
         def expected_messages_received_in_order?
           mock_proxy.replay_received_message_on @expectation, &@block
           @expectation.expected_messages_received? && @expectation.ensure_expected_ordering_received!

data/lib/rspec/mocks/message_expectation.rb

@@ -2,7 +2,7 @@ module RSpec
   module Mocks
     # A message expectation that only allows concrete return values to be set
     # for a message. While this same effect can be achieved using a standard
-    # MessageExpecation, this version is much faster and so can be used as an
+    # MessageExpectation, this version is much faster and so can be used as an
     # optimization.
     #
     # @private
@@ -169,7 +169,7 @@ module RSpec
       # Tells the object to yield one or more args to a block when the message
       # is received.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   stream.stub(:open).and_yield(StringIO.new)
       def and_yield(*args, &block)
@@ -191,7 +191,7 @@ module RSpec
       # Constrain a message expectation to be received a specific number of
       # times.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(dealer).to receive(:deal_card).exactly(10).times
       def exactly(n, &block)
@@ -204,7 +204,7 @@ module RSpec
       # Constrain a message expectation to be received at least a specific
       # number of times.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(dealer).to receive(:deal_card).at_least(9).times
       def at_least(n, &block)
@@ -223,7 +223,7 @@ module RSpec
       # Constrain a message expectation to be received at most a specific
       # number of times.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(dealer).to receive(:deal_card).at_most(10).times
       def at_most(n, &block)
@@ -235,7 +235,7 @@ module RSpec
 
       # Syntactic sugar for `exactly`, `at_least` and `at_most`
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(dealer).to receive(:deal_card).exactly(10).times
       #   expect(dealer).to receive(:deal_card).at_least(10).times
@@ -247,7 +247,7 @@ module RSpec
 
       # Expect a message not to be received at all.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(car).to receive(:stop).never
       def never
@@ -258,7 +258,7 @@ module RSpec
 
       # Expect a message to be received exactly one time.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(car).to receive(:go).once
       def once(&block)
@@ -269,7 +269,7 @@ module RSpec
 
       # Expect a message to be received exactly two times.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(car).to receive(:go).twice
       def twice(&block)
@@ -280,7 +280,7 @@ module RSpec
 
       # Expect a message to be received exactly three times.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(car).to receive(:go).thrice
       def thrice(&block)
@@ -302,7 +302,7 @@ module RSpec
       # A message expectation will fail if the message is received with different
       # arguments.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   allow(cart).to receive(:add) { :failure }
       #   allow(cart).to receive(:add).with(Book.new(:isbn => 1934356379)) { :success }
@@ -330,7 +330,7 @@ module RSpec
 
       # Expect messages to be received in a specific order.
       #
-      # @return [MessageExpecation] self, to support further chaining.
+      # @return [MessageExpectation] self, to support further chaining.
       # @example
       #   expect(api).to receive(:prepare).ordered
       #   expect(api).to receive(:run).ordered
@@ -345,7 +345,7 @@ module RSpec
       end
 
       # @private
-      # Contains the parts of `MessageExpecation` that aren't part of
+      # Contains the parts of `MessageExpectation` that aren't part of
       # rspec-mocks' public API. The class is very big and could really use
       # 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

data/lib/rspec/mocks/method_double.rb

@@ -3,7 +3,7 @@ module RSpec
     # @private
     class MethodDouble
       # @private
-      attr_reader :method_name, :object, :expectations, :stubs
+      attr_reader :method_name, :object, :expectations, :stubs, :method_stasher
 
       # @private
       def initialize(object, method_name, proxy)

data/lib/rspec/mocks/proxy.rb

@@ -89,11 +89,11 @@ module RSpec
           @error_generator.raise_expectation_on_unstubbed_method(expected_method_name)
         end
 
-        @messages_received.each do |(actual_method_name, args, _)|
+        @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) if block
+          block.call(*args, &received_block) if block
         end
       end
 
@@ -371,20 +371,36 @@ module RSpec
 
         return super unless unbound_method
         unbound_method.bind(object)
+        # :nocov:
+      rescue TypeError
+        if RUBY_VERSION == '1.8.7'
+          # In MRI 1.8.7, a singleton method on a class cannot be rebound to its subclass
+          if unbound_method && unbound_method.owner.ancestors.first != unbound_method.owner
+            # This is a singleton method; we can't do anything with it
+            # But we can work around this using a different implementation
+            double = method_double_from_ancestor_for(message)
+            return object.method(double.method_stasher.stashed_method_name)
+          end
+        end
+        raise
+        # :nocov:
       end
 
     protected
 
       def original_unbound_method_handle_from_ancestor_for(message)
-        method_double = @method_doubles.fetch(message) do
+        double = method_double_from_ancestor_for(message)
+        double && double.original_method.unbind
+      end
+
+      def method_double_from_ancestor_for(message)
+        @method_doubles.fetch(message) do
           # The fact that there is no method double for this message indicates
           # that it has not been redefined by rspec-mocks. We need to continue
           # looking up the ancestor chain.
           return superclass_proxy &&
-            superclass_proxy.original_unbound_method_handle_from_ancestor_for(message)
+            superclass_proxy.method_double_from_ancestor_for(message)
         end
-
-        method_double.original_method.unbind
       end
 
       def superclass_proxy
@@ -406,33 +422,62 @@ module RSpec
     # @private
     class ProxyForNil < PartialDoubleProxy
       def initialize(order_group)
-        @warn_about_expectations = true
+        set_expectation_behavior
         super(nil, order_group)
       end
 
+      attr_accessor :disallow_expectations
       attr_accessor :warn_about_expectations
-      alias warn_about_expectations? warn_about_expectations
 
       def add_message_expectation(method_name, opts={}, &block)
-        warn(method_name) if warn_about_expectations?
+        warn_or_raise!(method_name)
         super
       end
 
       def add_negative_message_expectation(location, method_name, &implementation)
-        warn(method_name) if warn_about_expectations?
+        warn_or_raise!(method_name)
         super
       end
 
       def add_stub(method_name, opts={}, &implementation)
-        warn(method_name) if warn_about_expectations?
+        warn_or_raise!(method_name)
         super
       end
 
     private
 
+      def set_expectation_behavior
+        case RSpec::Mocks.configuration.allow_message_expectations_on_nil
+        when false
+          @warn_about_expectations = false
+          @disallow_expectations = true
+        when true
+          @warn_about_expectations = false
+          @disallow_expectations = false
+        else
+          @warn_about_expectations = true
+          @disallow_expectations = false
+        end
+      end
+
+      def warn_or_raise!(method_name)
+        # This method intentionally swallows the message when
+        # neither disallow_expectations nor warn_about_expectations
+        # are set to true.
+        if disallow_expectations
+          raise_error(method_name)
+        elsif warn_about_expectations
+          warn(method_name)
+        end
+      end
+
       def warn(method_name)
-        source = CallerFilter.first_non_rspec_line
-        Kernel.warn("An expectation of :#{method_name} was set on nil. Called from #{source}. Use allow_message_expectations_on_nil to disable warnings.")
+        warning_msg = @error_generator.expectation_on_nil_message(method_name)
+        RSpec.warning(warning_msg)
+      end
+
+      def raise_error(method_name)
+        @error_generator.raise_expectation_on_nil_error(method_name)
       end
     end
   end

data/lib/rspec/mocks/space.rb

@@ -1,4 +1,4 @@
-RSpec::Support.require_rspec_mocks 'reentrant_mutex'
+RSpec::Support.require_rspec_support 'reentrant_mutex'
 
 module RSpec
   module Mocks
@@ -145,7 +145,7 @@ module RSpec
     private
 
       def new_mutex
-        Mocks::ReentrantMutex.new
+        Support::ReentrantMutex.new
       end
 
       def proxy_not_found_for(id, object)

data/lib/rspec/mocks/syntax.rb

@@ -48,7 +48,7 @@ module RSpec
           end
 
           def unstub(message)
-            ::RSpec::Mocks::Syntax.warn_unless_should_configured(__method__, "`allow(...).to_receive(...).and_call_original` or explicitly enable `:should`")
+            ::RSpec::Mocks::Syntax.warn_unless_should_configured(__method__, "`allow(...).to receive(...).and_call_original` or explicitly enable `:should`")
             ::RSpec::Mocks.space.proxy_for(self).remove_stub(message)
           end
 

data/lib/rspec/mocks/targets.rb

@@ -19,7 +19,7 @@ module RSpec
         method_name = options.fetch(:from)
         define_method(method_name) do |matcher, &block|
           case matcher
-          when Matchers::Receive
+          when Matchers::Receive, Matchers::HaveReceived
             define_matcher(matcher, matcher_method, &block)
           when Matchers::ReceiveMessages, Matchers::ReceiveMessageChain
             raise_negation_unsupported(method_name, matcher)
@@ -47,7 +47,7 @@ module RSpec
 
       def raise_unsupported_matcher(method_name, matcher)
         raise UnsupportedMatcherError,
-              "only the `receive` or `receive_messages` matchers are supported " \
+              "only the `receive`, `have_received` and `receive_messages` matchers are supported " \
               "with `#{expression}(...).#{method_name}`, but you have provided: #{matcher}"
       end
 

data/lib/rspec/mocks/{verifying_message_expecation.rb → verifying_message_expectation.rb}

@@ -42,7 +42,7 @@ module RSpec
           verifier = Support::LooseSignatureVerifier.new(signature, args)
 
           unless verifier.valid?
-            # Fail fast is required, otherwise the message expecation will fail
+            # Fail fast is required, otherwise the message expectation will fail
             # as well ("expected method not called") and clobber this one.
             @failed_fast = true
             @error_generator.raise_invalid_arguments_error(verifier)

data/lib/rspec/mocks/verifying_proxy.rb

@@ -1,4 +1,4 @@
-RSpec::Support.require_rspec_mocks 'verifying_message_expecation'
+RSpec::Support.require_rspec_mocks 'verifying_message_expectation'
 RSpec::Support.require_rspec_mocks 'method_reference'
 
 module RSpec

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.3.2'
+      STRING = '3.4.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-11-12 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.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.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.5'
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -137,20 +137,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: thread_order
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec@googlegroups.com
 executables: []
@@ -160,7 +146,7 @@ files:
 - ".document"
 - ".yardopts"
 - Changelog.md
-- License.txt
+- LICENSE.md
 - README.md
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
@@ -190,18 +176,16 @@ files:
 - lib/rspec/mocks/method_double.rb
 - lib/rspec/mocks/method_reference.rb
 - lib/rspec/mocks/mutate_const.rb
-- lib/rspec/mocks/mutex.rb
 - lib/rspec/mocks/object_reference.rb
 - lib/rspec/mocks/order_group.rb
 - lib/rspec/mocks/proxy.rb
-- lib/rspec/mocks/reentrant_mutex.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/standalone.rb
 - lib/rspec/mocks/syntax.rb
 - lib/rspec/mocks/targets.rb
 - lib/rspec/mocks/test_double.rb
 - lib/rspec/mocks/verifying_double.rb
-- lib/rspec/mocks/verifying_message_expecation.rb
+- lib/rspec/mocks/verifying_message_expectation.rb
 - lib/rspec/mocks/verifying_proxy.rb
 - lib/rspec/mocks/version.rb
 homepage: http://github.com/rspec/rspec-mocks
@@ -228,6 +212,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.3.2
+summary: rspec-mocks-3.4.0
 test_files: []
 has_rdoc: 

data/lib/rspec/mocks/mutex.rb

@@ -1,73 +0,0 @@
-module RSpec
-  module Mocks
-    # On 1.8.7, it's in the stdlib.
-    # We don't want to load the stdlib, b/c this is a test tool, and can affect
-    # the test environment, causing tests to pass where they should fail.
-    #
-    # So we're transcribing/modifying it from
-    # https://github.com/ruby/ruby/blob/v1_8_7_374/lib/thread.rb#L56
-    # Some methods we don't need are deleted. Anything I don't
-    # understand (there's quite a bit, actually) is left in.
-    #
-    # Some formating changes are made to appease the robot overlord:
-    #   https://travis-ci.org/rspec/rspec-core/jobs/54410874
-    # @private
-    class Mutex
-      def initialize
-        @waiting = []
-        @locked = false
-        @waiting.taint
-        taint
-      end
-
-      # @private
-      def lock
-        while Thread.critical = true && @locked
-          @waiting.push Thread.current
-          Thread.stop
-        end
-        @locked = true
-        Thread.critical = false
-        self
-      end
-
-      # @private
-      def unlock
-        return unless @locked
-        Thread.critical = true
-        @locked = false
-        wakeup_and_run_waiting_thread
-        self
-      end
-
-      # @private
-      def synchronize
-        lock
-        begin
-          yield
-        ensure
-          unlock
-        end
-      end
-
-    private
-
-      def wakeup_and_run_waiting_thread
-        begin
-          t = @waiting.shift
-          t.wakeup if t
-        rescue ThreadError
-          retry
-        end
-        Thread.critical = false
-        begin
-          t.run if t
-        rescue ThreadError
-          :noop
-        end
-      end
-
-      # Avoid warnings for library wide checks spec
-    end unless defined?(::RSpec::Mocks::Mutex) || defined?(::Mutex)
-  end
-end

data/lib/rspec/mocks/reentrant_mutex.rb

@@ -1,53 +0,0 @@
-module RSpec
-  module Mocks
-    # Allows a thread to lock out other threads from a critical section of code,
-    # while allowing the thread with the lock to reenter that section.
-    #
-    # Based on Monitor as of 2.2 -
-    # https://github.com/ruby/ruby/blob/eb7ddaa3a47bf48045d26c72eb0f263a53524ebc/lib/monitor.rb#L9
-    #
-    # Depends on Mutex, but Mutex is only available as part of core since 1.9.1:
-    #   exists - http://ruby-doc.org/core-1.9.1/Mutex.html
-    #   dne    - http://ruby-doc.org/core-1.9.0/Mutex.html
-    #
-    # @private
-    class ReentrantMutex
-      def initialize
-        @owner = nil
-        @count = 0
-        @mutex = Mutex.new
-      end
-
-      def synchronize
-        enter
-        yield
-      ensure
-        exit
-      end
-
-    private
-
-      def enter
-        @mutex.lock if @owner != Thread.current
-        @owner = Thread.current
-        @count += 1
-      end
-
-      def exit
-        @count -= 1
-        return unless @count == 0
-        @owner = nil
-        @mutex.unlock
-      end
-    end
-
-    if defined? ::Mutex
-      # On 1.9 and up, this is in core, so we just use the real one
-      Mutex = ::Mutex
-    else # For 1.8.7
-      # :nocov:
-      RSpec::Support.require_rspec_mocks "mutex"
-      # :nocov:
-    end
-  end
-end