rspec-mocks 3.5.0.beta2 → 3.5.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04c6f5ba70d371c519038204d10781a53a3c6f70
-  data.tar.gz: 621501f526471f9156e29b0a74a78b42779b5b10
+  metadata.gz: 120ba58f79094ffbb0cbc266d92aaf95e85dfb3e
+  data.tar.gz: b0550ddbdf1d1d12b5c2ced552eeed6e8dd9fe4d
 SHA512:
-  metadata.gz: 08c1dff465c3965b39ac0cac32171dc5706657ab792d84083de15d49487159be7c8b00ba2825009a673351e0e6506903748c3569aa2cc39f9eba47bf1c37874e
-  data.tar.gz: 0bec2879051701ddaa9d971ac3e56e1ec3456a69cbffd55c120e587d1507748d7ab292db3f768b7758f47359ef759f80b683e70c73c6b0efc5d11e11693b27ba
+  metadata.gz: cdec40e14778746cfa34d4625da45725560c2305ea3ffd993dbd9b2893c37b94b973d6343130ddd469661725b385b96deb0761e3cfc401207f6dbd8de9b2f708
+  data.tar.gz: 5bc6782dc04230c63393fad9c0d0a4fbb3d8fddaaee1d05ce08ffbc0ed24378a7725a12d6226b04393fd9b81b29bddfc29e07582c80ecd8340cc39417db42293

data/Changelog.md

@@ -5,6 +5,10 @@ Enhancements:
 
 * Improve error message displayed when using `and_wrap_original` on pure test
   doubles. (betesh, #1063)
+* Issue warning when attempting to use unsupported
+  `allow(...).to receive(...).ordered`. (Jon Rowe, #1000)
+* Add `rspec/mocks/minitest_integration`, to properly integration rspec-mocks
+  with minitest. (Myron Marston, #1065)
 
 Bug Fixes:
 

data/lib/rspec/mocks/message_expectation.rb

@@ -328,6 +328,13 @@ module RSpec
       #   expect(api).to receive(:run).ordered
       #   expect(api).to receive(:finish).ordered
       def ordered(&block)
+        if type == :stub
+          RSpec.warning(
+            "`allow(...).to receive(..).ordered` is not supported and will" \
+            "have no effect, use `and_return(*ordered_values)` instead."
+          )
+        end
+
         self.inner_implementation_action = block
         additional_expected_calls.times do
           @order_group.register(self)
@@ -349,9 +356,13 @@ module RSpec
         attr_writer :expected_received_count, :expected_from, :argument_list_matcher
         protected :expected_received_count=, :expected_from=, :error_generator, :error_generator=, :implementation=
 
+        # @private
+        attr_reader :type
+
         # rubocop:disable Style/ParameterLists
         def initialize(error_generator, expectation_ordering, expected_from, method_double,
                        type=:expectation, opts={}, &implementation_block)
+          @type = type
           @error_generator = error_generator
           @error_generator.opts = opts
           @expected_from = expected_from

data/lib/rspec/mocks/minitest_integration.rb

@@ -0,0 +1,68 @@
+require 'rspec/mocks'
+
+module RSpec
+  module Mocks
+    # @private
+    module MinitestIntegration
+      include ::RSpec::Mocks::ExampleMethods
+
+      def before_setup
+        ::RSpec::Mocks.setup
+        super
+      end
+
+      def after_teardown
+        super
+
+        # Only verify if there's not already an error. Otherwise
+        # we risk getting the same failure twice, since negative
+        # expectation violations raise both when the message is
+        # unexpectedly received, and also during `verify` (in case
+        # the first failure was caught by user code via a
+        # `rescue Exception`).
+        ::RSpec::Mocks.verify unless failures.any?
+      ensure
+        ::RSpec::Mocks.teardown
+      end
+    end
+  end
+end
+
+Minitest::Test.send(:include, RSpec::Mocks::MinitestIntegration)
+
+if defined?(::Minitest::Expectation)
+  if defined?(::RSpec::Expectations) && ::Minitest::Expectation.method_defined?(:to)
+    # rspec/expectations/minitest_integration has already been loaded and
+    # has defined `to`/`not_to`/`to_not` on `Minitest::Expectation` so we do
+    # not want to here (or else we would interfere with rspec-expectations' definition).
+  else
+    # ...otherwise, define those methods now. If `rspec/expectations/minitest_integration`
+    # is loaded after this file, it'll overide the defintion here.
+    Minitest::Expectation.class_eval do
+      include RSpec::Mocks::ExpectationTargetMethods
+
+      def to(*args)
+        ctx.assertions += 1
+        super
+      end
+
+      def not_to(*args)
+        ctx.assertions += 1
+        super
+      end
+
+      def to_not(*args)
+        ctx.assertions += 1
+        super
+      end
+    end
+  end
+end
+
+module RSpec
+  module Mocks
+    remove_const :MockExpectationError
+    # Raised when a message expectation is not satisfied.
+    MockExpectationError = ::Minitest::Assertion
+  end
+end

data/lib/rspec/mocks/targets.rb

@@ -1,12 +1,8 @@
 module RSpec
   module Mocks
     # @private
-    class TargetBase
-      def initialize(target)
-        @target = target
-      end
-
-      def self.delegate_to(matcher_method)
+    module TargetDelegationClassMethods
+      def delegate_to(matcher_method)
         define_method(:to) do |matcher, &block|
           unless matcher_allowed?(matcher)
             raise_unsupported_matcher(:to, matcher)
@@ -15,7 +11,7 @@ module RSpec
         end
       end
 
-      def self.delegate_not_to(matcher_method, options={})
+      def delegate_not_to(matcher_method, options={})
         method_name = options.fetch(:from)
         define_method(method_name) do |matcher, &block|
           case matcher
@@ -29,11 +25,16 @@ module RSpec
         end
       end
 
-      def self.disallow_negation(method_name)
+      def disallow_negation(method_name)
         define_method(method_name) do |matcher, *_args|
           raise_negation_unsupported(method_name, matcher)
         end
       end
+    end
+
+    # @private
+    module TargetDelegationInstanceMethods
+      attr_reader :target
 
     private
 
@@ -42,7 +43,7 @@ module RSpec
       end
 
       def define_matcher(matcher, name, &block)
-        matcher.__send__(name, @target, &block)
+        matcher.__send__(name, target, &block)
       end
 
       def raise_unsupported_matcher(method_name, matcher)
@@ -56,31 +57,54 @@ module RSpec
               "`#{expression}(...).#{method_name} #{matcher.name}` is not supported since it " \
               "doesn't really make sense. What would it even mean?"
       end
+    end
+
+    # @private
+    class TargetBase
+      def initialize(target)
+        @target = target
+      end
+
+      extend TargetDelegationClassMethods
+      include TargetDelegationInstanceMethods
+    end
+
+    # @private
+    module ExpectationTargetMethods
+      extend TargetDelegationClassMethods
+      include TargetDelegationInstanceMethods
+
+      delegate_to :setup_expectation
+      delegate_not_to :setup_negative_expectation, :from => :not_to
+      delegate_not_to :setup_negative_expectation, :from => :to_not
 
       def expression
-        self.class::EXPRESSION
+        :expect
       end
     end
 
+    # @private
+    class ExpectationTarget < TargetBase
+      include ExpectationTargetMethods
+    end
+
     # @private
     class AllowanceTarget < TargetBase
-      EXPRESSION = :allow
+      def expression
+        :allow
+      end
+
       delegate_to :setup_allowance
       disallow_negation :not_to
       disallow_negation :to_not
     end
 
-    # @private
-    class ExpectationTarget < TargetBase
-      EXPRESSION = :expect
-      delegate_to :setup_expectation
-      delegate_not_to :setup_negative_expectation, :from => :not_to
-      delegate_not_to :setup_negative_expectation, :from => :to_not
-    end
-
     # @private
     class AnyInstanceAllowanceTarget < TargetBase
-      EXPRESSION = :allow_any_instance_of
+      def expression
+        :allow_any_instance_of
+      end
+
       delegate_to :setup_any_instance_allowance
       disallow_negation :not_to
       disallow_negation :to_not
@@ -88,7 +112,10 @@ module RSpec
 
     # @private
     class AnyInstanceExpectationTarget < TargetBase
-      EXPRESSION = :expect_any_instance_of
+      def expression
+        :expect_any_instance_of
+      end
+
       delegate_to :setup_any_instance_expectation
       delegate_not_to :setup_any_instance_negative_expectation, :from => :not_to
       delegate_not_to :setup_any_instance_negative_expectation, :from => :to_not

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.5.0.beta2'
+      STRING = '3.5.0.beta3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta2
+  version: 3.5.0.beta3
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-02 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.5.0.beta2
+        version: 3.5.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta2
+        version: 3.5.0.beta3
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,7 @@ files:
 - lib/rspec/mocks/message_expectation.rb
 - lib/rspec/mocks/method_double.rb
 - lib/rspec/mocks/method_reference.rb
+- lib/rspec/mocks/minitest_integration.rb
 - lib/rspec/mocks/mutate_const.rb
 - lib/rspec/mocks/object_reference.rb
 - lib/rspec/mocks/order_group.rb
@@ -188,7 +189,7 @@ files:
 - 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
+homepage: https://github.com/rspec/rspec-mocks
 licenses:
 - MIT
 metadata: {}
@@ -209,9 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.5.0.beta2
+summary: rspec-mocks-3.5.0.beta3
 test_files: []
 has_rdoc: