mocha 2.1.0 → 2.7.1

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/parameters_matcher.rb

@@ -22,13 +22,17 @@ module Mocha
     end
 
     def mocha_inspect
-      signature = matchers.mocha_inspect
-      signature = signature.gsub(/^\[|\]$/, '')
-      "(#{signature})"
+      if @matching_block
+        '(arguments_accepted_by_custom_matching_block)'
+      else
+        signature = matchers.mocha_inspect
+        signature = signature.gsub(/^\[|\]$/, '')
+        "(#{signature})"
+      end
     end
 
     def matchers
-      @expected_parameters.map { |p| p.to_matcher(@expectation) }
+      @expected_parameters.map { |p| p.to_matcher(expectation: @expectation, top_level: true) }
     end
   end
 end

data/lib/mocha/ruby_version.rb

@@ -1,3 +1,4 @@
 module Mocha
   RUBY_V27_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.7')
+  RUBY_V34_PLUS = Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('3.4')
 end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.7.1'.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.'
@@ -21,6 +21,14 @@ Gem::Specification.new do |s|
   s.homepage = 'https://mocha.jamesmead.org'
   s.require_paths = ['lib']
   s.summary = 'Mocking and stubbing library'
+  s.metadata = {
+    'bug_tracker_uri' => 'https://github.com/freerange/mocha/issues',
+    'changelog_uri' => 'https://github.com/freerange/mocha/blob/main/RELEASE.md',
+    'documentation_uri' => 'https://mocha.jamesmead.org/',
+    'funding_uri' => 'https://github.com/sponsors/floehopper',
+    'homepage_uri' => s.homepage,
+    'source_code_uri' => 'https://github.com/freerange/mocha'
+  }
 
   s.add_runtime_dependency 'ruby2_keywords', '>= 0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.7.1
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2024-12-09 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
@@ -132,7 +132,13 @@ homepage: https://mocha.jamesmead.org
 licenses:
 - MIT
 - BSD-2-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/freerange/mocha/issues
+  changelog_uri: https://github.com/freerange/mocha/blob/main/RELEASE.md
+  documentation_uri: https://mocha.jamesmead.org/
+  funding_uri: https://github.com/sponsors/floehopper
+  homepage_uri: https://mocha.jamesmead.org
+  source_code_uri: https://github.com/freerange/mocha
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -141,14 +147,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Mocking and stubbing library

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