mocha 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4bd89c61177f213648b496bffa016c3546d6461da8552429560ff3f9804df4f
-  data.tar.gz: df6603b30f57ea57f6ba3383fc80df02ce0d94b246c35dd97b3eed80e689e717
+  metadata.gz: d39bbef9363c1fb12001142111cd1e324a7c304100f456d0c723e9d839a15de4
+  data.tar.gz: 9a91ce33d3fcacd82f4f4461da86042f66e9c0e0efdba61fbaf588aaddb0ce91
 SHA512:
-  metadata.gz: d3cb27ce0f13c163fb82a9ac9d3464ea3e0a2478a091033e1cb518a27db4dc4dad7ef16445a31cb363a31622b445413b132c7ffef29cc4b5c84183a7e951ec4d
-  data.tar.gz: ee6377fe60777af55832a284086920a4e1eff54824440f5ab4e9aa03c89e232034f0b0ec89abf5627de60c97d4f6405093144f37ec96217b31ba41ea125fd79b
+  metadata.gz: 0662556bb9f093c581bdea78f4484a0d8472dd63a7ee4589ebcdd4564628780e1cc68c32e9a4ae334d08ebe4bab75a9b9aeffe177a560e2e5424d9ff5349f4c7
+  data.tar.gz: ecabbed8691ddaea029cb0272705c1701c5b2815bfca4236baa559ea6f53eef3e8f650be861b81a43b3e9dff59edcca8a195ccaea7e2ef31f0990e8873753ed4

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 2.0'
+  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 2.1'
 
 # Even the reference in the documentation suggests that you should prefer
 # `alias_method` vs `alias`, so I don't understand why that isn't the default.

data/.yardopts

@@ -16,7 +16,7 @@ lib/mocha/expectation_error.rb
 lib/mocha/stubbing_error.rb
 lib/mocha/unexpected_invocation.rb
 lib/mocha/integration/test_unit/adapter.rb
-lib/mocha/integration/mini_test/adapter.rb
+lib/mocha/integration/minitest/adapter.rb
 -
 RELEASE.md
 COPYING.md

data/README.md

@@ -4,7 +4,7 @@
 
 * A Ruby library for [mocking](http://xunitpatterns.com/Mock%20Object.html) and [stubbing](http://xunitpatterns.com/Test%20Stub.html) - but deliberately not (yet) [faking](http://xunitpatterns.com/Fake%20Object.html) or [spying](http://xunitpatterns.com/Test%20Spy.html).
 * A unified, simple and readable syntax for both full & partial mocking.
-* Built-in support for MiniTest and Test::Unit.
+* Built-in support for Minitest and Test::Unit.
 * Supported by many other test frameworks.
 
 ### Intended Usage
@@ -18,7 +18,7 @@ Install the latest version of the gem with the following command...
 
     $ gem install mocha
 
-Note: If you are intending to use Mocha with Test::Unit or MiniTest, you should only setup Mocha *after* loading the relevant test library...
+Note: If you are intending to use Mocha with Test::Unit or Minitest, you should only setup Mocha *after* loading the relevant test library...
 
 ##### Test::Unit
 
@@ -29,12 +29,12 @@ require 'test/unit'
 require 'mocha/test_unit'
 ```
 
-##### MiniTest
+##### Minitest
 
 ```ruby
 require 'rubygems'
 gem 'mocha'
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'mocha/minitest'
 ```
 
@@ -53,14 +53,14 @@ require 'test/unit'
 require 'mocha/test_unit'
 ```
 
-##### MiniTest
+##### Minitest
 
 ```ruby
 # Gemfile
 gem 'mocha'
 
 # Elsewhere after Bundler has loaded gems e.g. after `require 'bundler/setup'`
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'mocha/minitest'
 ```
 
@@ -103,9 +103,9 @@ end
 
 If you're loading Mocha using Bundler within a Rails application, you should setup Mocha manually e.g. at the bottom of your `test_helper.rb`.
 
-##### MiniTest
+##### Minitest
 
-Note that since Rails v4 (at least), `ActiveSupport::TestCase` has inherited from `Minitest::Test` or its earlier equivalents. Thus unless you are *explicitly* using Test::Unit, you are likely to be using MiniTest.
+Note that since Rails v4 (at least), `ActiveSupport::TestCase` has inherited from `Minitest::Test` or its earlier equivalents. Thus unless you are *explicitly* using Test::Unit, you are likely to be using Minitest.
 
 ```ruby
 # Gemfile in Rails app
@@ -151,7 +151,7 @@ class MiscExampleTest < Test::Unit::TestCase
   end
 
   def test_stubbing_instance_methods_on_real_objects
-    prices = [stub(:pence => 1000), stub(:pence => 2000)]
+    prices = [stub(pence: 1000), stub(pence: 2000)]
     product = Product.new
     product.stubs(:prices).returns(prices)
     assert_equal [1000, 2000], product.prices.collect {|p| p.pence}
@@ -170,7 +170,7 @@ class MiscExampleTest < Test::Unit::TestCase
   end
 
   def test_shortcuts
-    object = stub(:method1 => :result1, :method2 => :result2)
+    object = stub(method1: :result1, method2: :result2)
     assert_equal :result1, object.method1
     assert_equal :result2, object.method2
   end

data/RELEASE.md

@@ -1,5 +1,33 @@
 # Release Notes
 
+## 2.3.0
+
+### External changes
+
+* Fix nested parameter matching for keyword arguments (f94e2504, #648) - thanks to @CodingAnarchy for reporting
+
+## 2.2.0
+
+### External changes
+
+* Support multiple methods in `responds_with` matcher (f086b7e4, #578) - thanks to @vlad-pisanov for the suggestion
+* Add block syntax for sequences (93fdffd, #61)
+* Improve sequence failure message (0800c6ff, #60)
+* Drop support for Ruby v2.0 (85848fb0, #642)
+* Include the original test name in expired stub error messages (ca3ff8eb, #641, #642) - thanks to @casperisfine
+
+* Avoid rubocop directive ending up in YARD docs (2a9ee81a)
+* Update docs to fix those for `Mock#method_missing` (cee0bad6)
+* Reinstate missing CNAME for GitHub Pages site (da67bb0d)
+* Use Ruby v1.9 Hash syntax in docs (6de20726, #625)
+* Add missing YARD tag for API#sequence name param (343c5979)
+* Add missing YARD tag for API#states name param (f798df83)
+
+### Internal changes
+
+* Tidy up Minitest vs MiniTest references (#626, #614, #615) - thanks to @zenspider & @Maimer for their help
+* Add Ruby v3.3 to CI build matrix (ce31b544)
+
 ## 2.1.0
 
 ### External changes

data/Rakefile

@@ -42,10 +42,10 @@ namespace 'test' do # rubocop:disable Metrics/BlockLength
   end
 
   namespace 'integration' do
-    desc 'Run MiniTest integration tests (intended to be run in its own process)'
+    desc 'Run Minitest integration tests (intended to be run in its own process)'
     Rake::TestTask.new('minitest') do |t|
       t.libs << 'test'
-      t.test_files = FileList['test/integration/mini_test_test.rb']
+      t.test_files = FileList['test/integration/minitest_test.rb']
       t.verbose = true
       t.warning = true
     end
@@ -93,18 +93,18 @@ end
 # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 def benchmark_test_case(klass, iterations)
   require 'benchmark'
-  require 'mocha/detection/mini_test'
+  require 'mocha/detection/minitest'
 
-  if defined?(MiniTest)
-    minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
+  if defined?(Minitest)
+    minitest_version = Gem::Version.new(Mocha::Detection::Minitest.version)
     if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
       Minitest.seed = 1
-      result = Benchmark.realtime { iterations.times { |_i| klass.run(MiniTest::CompositeReporter.new) } }
-      MiniTest::Runnable.runnables.delete(klass)
+      result = Benchmark.realtime { iterations.times { |_i| klass.run(Minitest::CompositeReporter.new) } }
+      Minitest::Runnable.runnables.delete(klass)
       result
     else
-      MiniTest::Unit.output = StringIO.new
-      Benchmark.realtime { iterations.times { |_i| MiniTest::Unit.new.run([klass]) } }
+      Minitest::Unit.output = StringIO.new
+      Benchmark.realtime { iterations.times { |_i| Minitest::Unit.new.run([klass]) } }
     end
   else
     load 'test/unit/ui/console/testrunner.rb' unless defined?(Test::Unit::UI::Console::TestRunner)

data/lib/mocha/api.rb

@@ -7,7 +7,7 @@ require 'mocha/object_methods'
 require 'mocha/class_methods'
 
 module Mocha
-  # Methods added to +Test::Unit::TestCase+, +MiniTest::Unit::TestCase+ or equivalent.
+  # Methods added to +Test::Unit::TestCase+, +Minitest::Unit::TestCase+ or equivalent.
   # The mock creation methods are {#mock}, {#stub} and {#stub_everything}, all of which return a #{Mock}
   # which can be further modified by {Mock#responds_like} and {Mock#responds_like_instance_of} methods,
   # both of which return a {Mock}, too, and can therefore, be chained to the original creation methods.
@@ -60,7 +60,7 @@ module Mocha
     #
     # @example Using expected_methods_vs_return_values Hash to setup expectations.
     #   def test_motor_starts_and_stops
-    #     motor = mock('motor', :start => true, :stop => true)
+    #     motor = mock('motor', start: true, stop: true)
     #     assert motor.start
     #     assert motor.stop
     #     # an error will be raised unless both Motor#start and Motor#stop have been called
@@ -88,7 +88,7 @@ module Mocha
     #
     # @example Using stubbed_methods_vs_return_values Hash to setup stubbed methods.
     #   def test_motor_starts_and_stops
-    #     motor = stub('motor', :start => true, :stop => true)
+    #     motor = stub('motor', start: true, stop: true)
     #     assert motor.start
     #     assert motor.stop
     #     # an error will not be raised even if either Motor#start or Motor#stop has not been called
@@ -115,7 +115,7 @@ module Mocha
     #
     # @example Ignore invocations of irrelevant methods.
     #   def test_motor_stops
-    #     motor = stub_everything('motor', :stop => true)
+    #     motor = stub_everything('motor', stop: true)
     #     assert_nil motor.irrelevant_method_1 # => no error raised
     #     assert_nil motor.irrelevant_method_2 # => no error raised
     #     assert motor.stop
@@ -131,8 +131,11 @@ module Mocha
 
     # Builds a new sequence which can be used to constrain the order in which expectations can occur.
     #
-    # Specify that an expected invocation must occur within a named {Sequence} by using {Expectation#in_sequence}.
+    # Specify that an expected invocation must occur within a named {Sequence} by calling {Expectation#in_sequence}
+    # on each expectation or by passing a block within which all expectations should be constrained by the {Sequence}.
     #
+    # @param [String] name name of sequence
+    # @yield optional block within which expectations should be constrained by the sequence
     # @return [Sequence] a new sequence
     #
     # @see Expectation#in_sequence
@@ -156,8 +159,23 @@ module Mocha
     #
     #   task_one.execute
     #   task_two.execute
+    #
+    # @example Ensure methods on egg are invoked in the correct order using a block.
+    #   egg = mock('egg')
+    #   sequence('breakfast') do
+    #     egg.expects(:crack)
+    #     egg.expects(:fry)
+    #     egg.expects(:eat)
+    #   end
     def sequence(name)
-      Sequence.new(name)
+      Sequence.new(name).tap do |seq|
+        Mockery.instance.sequences.push(seq)
+        begin
+          yield if block_given?
+        ensure
+          Mockery.instance.sequences.pop
+        end
+      end
     end
 
     # Builds a new state machine which can be used to constrain the order in which expectations can occur.
@@ -170,6 +188,7 @@ module Mocha
     #
     # A test can contain multiple state machines.
     #
+    # @param [String] name name of state machine
     # @return [StateMachine] a new state machine
     #
     # @see Expectation#then

data/lib/mocha/detection/{mini_test.rb → minitest.rb}

@@ -1,17 +1,17 @@
 module Mocha
   module Detection
-    module MiniTest
+    module Minitest
       def self.testcase
         if defined?(::Minitest::Test)
           ::Minitest::Test
-        elsif defined?(::MiniTest::Unit::TestCase)
-          ::MiniTest::Unit::TestCase
+        elsif defined?(::Minitest::Unit::TestCase)
+          ::Minitest::Unit::TestCase
         end
       end
 
       def self.version
-        if defined?(::MiniTest::Unit::VERSION)
-          ::MiniTest::Unit::VERSION
+        if defined?(::Minitest::Unit::VERSION)
+          ::Minitest::Unit::VERSION
         elsif defined?(::Minitest::VERSION)
           ::Minitest::VERSION
         else

data/lib/mocha/detection/test_unit.rb

@@ -3,8 +3,8 @@ module Mocha
     module TestUnit
       def self.testcase
         if defined?(::Test::Unit::TestCase) &&
-           !(defined?(::MiniTest::Unit::TestCase) && (::Test::Unit::TestCase < ::MiniTest::Unit::TestCase)) &&
-           !(defined?(::MiniTest::Spec) && (::Test::Unit::TestCase < ::MiniTest::Spec))
+           !(defined?(::Minitest::Unit::TestCase) && (::Test::Unit::TestCase < ::Minitest::Unit::TestCase)) &&
+           !(defined?(::Minitest::Spec) && (::Test::Unit::TestCase < ::Minitest::Spec))
           ::Test::Unit::TestCase
         end
       end

data/lib/mocha/expectation.rb

@@ -632,14 +632,20 @@ module Mocha
       @ordering_constraints.all?(&:allows_invocation_now?)
     end
 
+    # @private
+    def ordering_constraints_not_allowing_invocation_now
+      @ordering_constraints.reject(&:allows_invocation_now?)
+    end
+
     # @private
     def matches_method?(method_name)
       @method_matcher.match?(method_name)
     end
 
     # @private
-    def match?(invocation)
-      @method_matcher.match?(invocation.method_name) && @parameters_matcher.match?(invocation.arguments) && @block_matcher.match?(invocation.block) && in_correct_order?
+    def match?(invocation, ignoring_order: false)
+      order_independent_match = @method_matcher.match?(invocation.method_name) && @parameters_matcher.match?(invocation.arguments) && @block_matcher.match?(invocation.block)
+      ignoring_order ? order_independent_match : order_independent_match && in_correct_order?
     end
 
     # @private

data/lib/mocha/expectation_error_factory.rb

@@ -6,9 +6,9 @@ module Mocha
   #
   # This class should only be used by authors of test libraries and not by typical "users" of Mocha.
   #
-  # For example, it is used by +Mocha::Integration::MiniTest::Adapter+ in order to have Mocha raise a +MiniTest::Assertion+ which can then be sensibly handled by +MiniTest::Unit::TestCase+.
+  # For example, it is used by +Mocha::Integration::Minitest::Adapter+ in order to have Mocha raise a +Minitest::Assertion+ which can then be sensibly handled by +Minitest::Unit::TestCase+.
   #
-  # @see Mocha::Integration::MiniTest::Adapter
+  # @see Mocha::Integration::Minitest::Adapter
   class ExpectationErrorFactory
     class << self
       # @!attribute exception_class

data/lib/mocha/expectation_list.rb

@@ -17,7 +17,11 @@ module Mocha
       @expectations.any? { |expectation| expectation.matches_method?(method_name) }
     end
 
-    def match(invocation)
+    def match(invocation, ignoring_order: false)
+      matching_expectations(invocation, ignoring_order: ignoring_order).first
+    end
+
+    def match_but_out_of_order(invocation)
       matching_expectations(invocation).first
     end
 
@@ -51,8 +55,8 @@ module Mocha
 
     private
 
-    def matching_expectations(invocation)
-      @expectations.select { |e| e.match?(invocation) }
+    def matching_expectations(invocation, ignoring_order: false)
+      @expectations.select { |e| e.match?(invocation, ignoring_order: ignoring_order) }
     end
   end
 end

data/lib/mocha/hooks.rb

@@ -7,12 +7,12 @@ module Mocha
   #
   # This module is provided as part of the +Mocha::API+ module and is therefore part of the public API, but should only be used by authors of test libraries and not by typical "users" of Mocha.
   #
-  # Integration with Test::Unit and MiniTest are provided as part of Mocha, because they are (or were once) part of the Ruby standard library. Integration with other test libraries is not provided as *part* of Mocha, but is supported by means of the methods in this module.
+  # Integration with Test::Unit and Minitest are provided as part of Mocha, because they are (or were once) part of the Ruby standard library. Integration with other test libraries is not provided as *part* of Mocha, but is supported by means of the methods in this module.
   #
   # See the code in the +Adapter+ modules for examples of how to use the methods in this module. +Mocha::ExpectationErrorFactory+ may be used if you want +Mocha+ to raise a different type of exception.
   #
   # @see Mocha::Integration::TestUnit::Adapter
-  # @see Mocha::Integration::MiniTest::Adapter
+  # @see Mocha::Integration::Minitest::Adapter
   # @see Mocha::ExpectationErrorFactory
   # @see Mocha::API
   module Hooks
@@ -35,8 +35,14 @@ module Mocha
     # Resets Mocha after a test (only for use by authors of test libraries).
     #
     # This method should be called after each individual test has finished (including after any "teardown" code).
-    def mocha_teardown
-      Mockery.teardown
+    def mocha_teardown(origin = mocha_test_name)
+      Mockery.teardown(origin)
+    end
+
+    # Returns a string representing the unit test name, to be included in some Mocha
+    # to help track down potential bugs.
+    def mocha_test_name
+      nil
     end
   end
 end

data/lib/mocha/integration/{mini_test → minitest}/adapter.rb

@@ -4,21 +4,21 @@ require 'mocha/expectation_error_factory'
 
 module Mocha
   module Integration
-    module MiniTest
-      # Integrates Mocha into recent versions of MiniTest.
+    module Minitest
+      # Integrates Mocha into recent versions of Minitest.
       #
       # See the source code for an example of how to integrate Mocha into a test library.
       module Adapter
         include Mocha::API
 
         # @private
-        def self.applicable_to?(mini_test_version)
-          Gem::Requirement.new('>= 3.3.0').satisfied_by?(mini_test_version)
+        def self.applicable_to?(minitest_version)
+          Gem::Requirement.new('>= 3.3.0').satisfied_by?(minitest_version)
         end
 
         # @private
         def self.description
-          'adapter for MiniTest gem >= v3.3.0'
+          'adapter for Minitest gem >= v3.3.0'
         end
 
         # @private
@@ -46,6 +46,21 @@ module Mocha
           super
           mocha_teardown
         end
+
+        # @private
+        def mocha_test_name
+          if respond_to?(:name)
+            test_name = name
+          elsif respond_to?(:__name__) # Older minitest
+            test_name = __name__
+          end
+
+          if test_name
+            "#{self.class.name}##{test_name}"
+          else
+            self.class.name
+          end
+        end
       end
     end
   end

data/lib/mocha/integration/{mini_test → minitest}/exception_translation.rb

@@ -2,10 +2,10 @@ require 'mocha/expectation_error'
 
 module Mocha
   module Integration
-    module MiniTest
+    module Minitest
       def self.translate(exception)
         return exception unless exception.is_a?(::Mocha::ExpectationError)
-        translated_exception = ::MiniTest::Assertion.new(exception.message)
+        translated_exception = ::Minitest::Assertion.new(exception.message)
         translated_exception.set_backtrace(exception.backtrace)
         translated_exception
       end

data/lib/mocha/integration/minitest.rb

@@ -0,0 +1,28 @@
+require 'mocha/debug'
+require 'mocha/detection/minitest'
+require 'mocha/integration/minitest/adapter'
+
+module Mocha
+  module Integration
+    module Minitest
+      def self.activate
+        target = Detection::Minitest.testcase
+        return false unless target
+
+        minitest_version = Gem::Version.new(Detection::Minitest.version)
+        Debug.puts "Detected Minitest version: #{minitest_version}"
+
+        unless Minitest::Adapter.applicable_to?(minitest_version)
+          raise 'Versions of minitest earlier than v3.3.0 are not supported.'
+        end
+
+        unless target < Minitest::Adapter
+          Debug.puts "Applying #{Minitest::Adapter.description}"
+          target.send(:include, Minitest::Adapter)
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/mocha/integration/test_unit/adapter.rb

@@ -37,6 +37,11 @@ module Mocha
 
         private
 
+        # @private
+        def mocha_test_name
+          name
+        end
+
         # @private
         def handle_mocha_expectation_error(exception)
           return false unless exception.is_a?(Mocha::ExpectationError)

data/lib/mocha/minitest.rb

@@ -1,6 +1,6 @@
 require 'mocha/ruby_version'
-require 'mocha/integration/mini_test'
+require 'mocha/integration/minitest'
 
-unless Mocha::Integration::MiniTest.activate
-  raise "MiniTest must be loaded *before* `require 'mocha/minitest'`."
+unless Mocha::Integration::Minitest.activate
+  raise "Minitest must be loaded *before* `require 'mocha/minitest'`."
 end

data/lib/mocha/mock.rb

@@ -100,7 +100,7 @@ module Mocha
     #
     # @example Setup multiple expectations using +expected_methods_vs_return_values+.
     #   object = mock()
-    #   object.expects(:expected_method_one => :result_one, :expected_method_two => :result_two)
+    #   object.expects(expected_method_one: :result_one, expected_method_two: :result_two)
     #
     #   # is exactly equivalent to
     #
@@ -114,6 +114,7 @@ module Mocha
         method_name = args.shift
         ensure_method_not_already_defined(method_name)
         expectation = Expectation.new(self, method_name, backtrace)
+        expectation.in_sequence(@mockery.sequences.last) if @mockery.sequences.any?
         expectation.returns(args.shift) unless args.empty?
         @expectations.add(expectation)
       end
@@ -138,7 +139,7 @@ module Mocha
     #
     # @example Setup multiple expectations using +stubbed_methods_vs_return_values+.
     #   object = mock()
-    #   object.stubs(:stubbed_method_one => :result_one, :stubbed_method_two => :result_two)
+    #   object.stubs(stubbed_method_one: :result_one, stubbed_method_two: :result_two)
     #
     #   # is exactly equivalent to
     #
@@ -153,6 +154,7 @@ module Mocha
         ensure_method_not_already_defined(method_name)
         expectation = Expectation.new(self, method_name, backtrace)
         expectation.at_least(0)
+        expectation.in_sequence(@mockery.sequences.last) if @mockery.sequences.any?
         expectation.returns(args.shift) unless args.empty?
         @expectations.add(expectation)
       end
@@ -309,12 +311,10 @@ module Mocha
     end
 
     # @private
-    # rubocop:disable Style/MethodMissingSuper
-    def method_missing(symbol, *arguments, &block)
+    def method_missing(symbol, *arguments, &block) # rubocop:disable Style/MethodMissingSuper
       handle_method_call(symbol, arguments, block)
     end
     ruby2_keywords(:method_missing)
-    # rubocop:enable Style/MethodMissingSuper
 
     # @private
     def handle_method_call(symbol, arguments, block)
@@ -323,7 +323,7 @@ module Mocha
       invocation = Invocation.new(self, symbol, arguments, block)
       if (matching_expectation_allowing_invocation = all_expectations.match_allowing_invocation(invocation))
         matching_expectation_allowing_invocation.invoke(invocation)
-      elsif (matching_expectation = all_expectations.match(invocation)) || (!matching_expectation && !@everything_stubbed)
+      elsif (matching_expectation = all_expectations.match(invocation, ignoring_order: true)) || (!matching_expectation && !@everything_stubbed)
         raise_unexpected_invocation_error(invocation, matching_expectation)
       end
     end
@@ -343,8 +343,8 @@ module Mocha
     end
 
     # @private
-    def __expire__
-      @expired = true
+    def __expire__(origin)
+      @expired = origin || true
     end
 
     # @private
@@ -373,7 +373,11 @@ module Mocha
       if @unexpected_invocation.nil?
         @unexpected_invocation = invocation
         matching_expectation.invoke(invocation) if matching_expectation
-        message = "#{@unexpected_invocation.call_description}\n#{@mockery.mocha_inspect}"
+        call_description = @unexpected_invocation.call_description
+        if matching_expectation && !matching_expectation.in_correct_order?
+          call_description += ' invoked out of order'
+        end
+        message = "#{call_description}\n#{@mockery.mocha_inspect}"
       else
         message = @unexpected_invocation.short_call_description
       end
@@ -389,8 +393,10 @@ module Mocha
     def check_expiry
       return unless @expired
 
+      origin = @expired == true ? 'one test' : @expired
+
       sentences = [
-        "#{mocha_inspect} was instantiated in one test but it is receiving invocations within another test.",
+        "#{mocha_inspect} was instantiated in #{origin} but it is receiving invocations within another test.",
         'This can lead to unintended interactions between tests and hence unexpected test failures.',
         'Ensure that every test correctly cleans up any state that it introduces.'
       ]

data/lib/mocha/mockery.rb

@@ -48,8 +48,8 @@ module Mocha
         instance.verify(*args)
       end
 
-      def teardown
-        instance.teardown
+      def teardown(origin = nil)
+        instance.teardown(origin)
       ensure
         @instances.pop
       end
@@ -91,9 +91,9 @@ module Mocha
       end
     end
 
-    def teardown
+    def teardown(origin = nil)
       stubba.unstub_all
-      mocks.each(&:__expire__)
+      mocks.each { |m| m.__expire__(origin) }
       reset
     end
 
@@ -109,6 +109,10 @@ module Mocha
       @state_machines ||= []
     end
 
+    def sequences
+      @sequences ||= []
+    end
+
     def mocha_inspect
       message = ''
       message << "unsatisfied expectations:\n- #{unsatisfied_expectations.map(&:mocha_inspect).join("\n- ")}\n" if unsatisfied_expectations.any?

data/lib/mocha/object_methods.rb

@@ -59,7 +59,7 @@ module Mocha
     #
     # @example Setting up multiple expectations on a non-mock object.
     #   product = Product.new
-    #   product.expects(:valid? => true, :save => true)
+    #   product.expects(valid?: true, save: true)
     #
     #   # exactly equivalent to
     #
@@ -108,7 +108,7 @@ module Mocha
     #
     # @example Setting up multiple stubbed methods on a non-mock object.
     #   product = Product.new
-    #   product.stubs(:valid? => true, :save => true)
+    #   product.stubs(valid?: true, save: true)
     #
     #   # exactly equivalent to
     #

data/lib/mocha/parameter_matchers/base.rb

@@ -21,12 +21,12 @@ module Mocha
       # @example Alternative ways to combine matchers with a logical AND.
       #   object = mock()
       #   object.expects(:run).with(all_of(has_key(:foo), has_key(:bar)))
-      #   object.run(:foo => 'foovalue', :bar => 'barvalue')
+      #   object.run(foo: 'foovalue', bar: 'barvalue')
       #
       #   # is exactly equivalent to
       #
       #   object.expects(:run).with(has_key(:foo) & has_key(:bar))
-      #   object.run(:foo => 'foovalue', :bar => 'barvalue)
+      #   object.run(foo: 'foovalue', bar: 'barvalue)
       def &(other)
         AllOf.new(self, other)
       end
@@ -45,12 +45,12 @@ module Mocha
       # @example Alternative ways to combine matchers with a logical OR.
       #   object = mock()
       #   object.expects(:run).with(any_of(has_key(:foo), has_key(:bar)))
-      #   object.run(:foo => 'foovalue')
+      #   object.run(foo: 'foovalue')
       #
       #   # is exactly equivalent to
       #
       #   object.expects(:run).with(has_key(:foo) | has_key(:bar))
-      #   object.run(:foo => 'foovalue')
+      #   object.run(foo: 'foovalue')
       #
       # @example Using an explicit {Equals} matcher in combination with {#|}.
       #   object.expects(:run).with(equals(1) | equals(2))

data/lib/mocha/parameter_matchers/includes.rb

@@ -24,7 +24,7 @@ module Mocha
     # @example Actual parameter includes item which matches nested matcher.
     #   object = mock()
     #   object.expects(:method_1).with(includes(has_key(:key)))
-    #   object.method_1(['foo', 'bar', {:key => 'baz'}])
+    #   object.method_1(['foo', 'bar', {key: 'baz'}])
     #   # no error raised
     #
     # @example Actual parameter does not include item matching nested matcher.
@@ -44,11 +44,11 @@ module Mocha
     # @example Actual parameter is a Hash including the given key.
     #   object = mock()
     #   object.expects(:method_1).with(includes(:bar))
-    #   object.method_1({:foo => 1, :bar => 2})
+    #   object.method_1({foo: 1, bar: 2})
     #   # no error raised
     #
     # @example Actual parameter is a Hash without the given key.
-    #   object.method_1({:foo => 1, :baz => 2})
+    #   object.method_1({foo: 1, baz: 2})
     #   # error raised, because hash does not include key 'bar'
     #
     # @example Actual parameter is a Hash with a key matching the given matcher.

data/lib/mocha/parameter_matchers/positional_or_keyword_hash.rb

@@ -13,7 +13,8 @@ module Mocha
 
       def matches?(available_parameters)
         parameter, is_last_parameter = extract_parameter(available_parameters)
-        return false unless parameter == @value
+
+        return false unless HasEntries.new(@value).matches?([parameter])
 
         if is_last_parameter && !same_type_of_hash?(parameter, @value)
           return false if Mocha.configuration.strict_keyword_argument_matching?

data/lib/mocha/parameter_matchers/responds_with.rb

@@ -1,12 +1,18 @@
 require 'mocha/parameter_matchers/base'
+require 'mocha/parameter_matchers/all_of'
 require 'yaml'
 
 module Mocha
   module ParameterMatchers
-    # Matches any object that responds to +message+ with +result+. To put it another way, it tests the quack, not the duck.
+    # @overload def responds_with(message, result)
+    #   Matches any object that responds to +message+ with +result+. To put it another way, it tests the quack, not the duck.
+    #   @param [Symbol] message method to invoke.
+    #   @param [Object] result expected result of sending +message+.
+    # @overload def responds_with(messages_vs_results)
+    #   Matches any object that responds to all the messages with the corresponding results as specified by +messages_vs_results+.
+    #   @param [Hash<Symbol,Object>] messages_vs_results +Hash+ of messages vs results.
+    #   @raise [ArgumentError] if +messages_vs_results+ does not contain at least one entry.
     #
-    # @param [Symbol] message method to invoke.
-    # @param [Object] result expected result of sending +message+.
     # @return [RespondsWith] parameter matcher.
     #
     # @see Expectation#with
@@ -22,8 +28,29 @@ module Mocha
     #   object.expects(:method_1).with(responds_with(:upcase, "BAR"))
     #   object.method_1("foo")
     #   # error raised, because "foo".upcase != "BAR"
-    def responds_with(message, result)
-      RespondsWith.new(message, result)
+    #
+    # @example Actual parameter responds with "FOO" when :upcase is invoked and "oof" when :reverse is invoked.
+    #   object = mock()
+    #   object.expects(:method_1).with(responds_with(upcase: "FOO", reverse: "oof"))
+    #   object.method_1("foo")
+    #   # no error raised, because "foo".upcase == "FOO" and "foo".reverse == "oof"
+    def responds_with(*options)
+      case options.length
+      when 0
+        raise ArgumentError, 'No arguments. Expecting at least one.'
+      when 1
+        option = options.first
+        raise ArgumentError, 'Argument is not a Hash.' unless option.is_a?(Hash)
+        raise ArgumentError, 'Argument has no entries.' if option.empty?
+
+        matchers = option.map { |message, result| RespondsWith.new(message, result) }
+        AllOf.new(*matchers)
+      when 2
+        message, result = options
+        RespondsWith.new(message, result)
+      else
+        raise ArgumentError, 'Too many arguments; use either a single argument (must be a Hash) or two arguments (a message and a result).'
+      end
     end
 
     # Parameter matcher which matches if actual parameter returns expected result when specified method is invoked.

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/mocha.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name = 'mocha'
   s.version = Mocha::VERSION
   s.licenses = ['MIT', 'BSD-2-Clause']
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = '>= 2.1'
 
   s.authors = ['James Mead']
   s.description = 'Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
@@ -58,7 +58,7 @@ files:
 - lib/mocha/configuration.rb
 - lib/mocha/debug.rb
 - lib/mocha/deprecation.rb
-- lib/mocha/detection/mini_test.rb
+- lib/mocha/detection/minitest.rb
 - lib/mocha/detection/test_unit.rb
 - lib/mocha/error_with_filtered_backtrace.rb
 - lib/mocha/exception_raiser.rb
@@ -71,9 +71,9 @@ files:
 - lib/mocha/inspect.rb
 - lib/mocha/instance_method.rb
 - lib/mocha/integration/assertion_counter.rb
-- lib/mocha/integration/mini_test.rb
-- lib/mocha/integration/mini_test/adapter.rb
-- lib/mocha/integration/mini_test/exception_translation.rb
+- lib/mocha/integration/minitest.rb
+- lib/mocha/integration/minitest/adapter.rb
+- lib/mocha/integration/minitest/exception_translation.rb
 - lib/mocha/integration/monkey_patcher.rb
 - lib/mocha/integration/test_unit.rb
 - lib/mocha/integration/test_unit/adapter.rb
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/mocha/integration/mini_test.rb

@@ -1,28 +0,0 @@
-require 'mocha/debug'
-require 'mocha/detection/mini_test'
-require 'mocha/integration/mini_test/adapter'
-
-module Mocha
-  module Integration
-    module MiniTest
-      def self.activate
-        target = Detection::MiniTest.testcase
-        return false unless target
-
-        mini_test_version = Gem::Version.new(Detection::MiniTest.version)
-        Debug.puts "Detected MiniTest version: #{mini_test_version}"
-
-        unless MiniTest::Adapter.applicable_to?(mini_test_version)
-          raise 'Versions of minitest earlier than v3.3.0 are not supported.'
-        end
-
-        unless target < MiniTest::Adapter
-          Debug.puts "Applying #{MiniTest::Adapter.description}"
-          target.send(:include, MiniTest::Adapter)
-        end
-
-        true
-      end
-    end
-  end
-end