flexmock 2.2.1 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac25b7c70e3a49d1404279263c5ad6e5cfb19128
-  data.tar.gz: 41c3cc477ad1623060a73eacd7dea095226ad6c3
+SHA256:
+  metadata.gz: 55dadc89381c542f0d6f81c9484b4febc6adf1ef2b8292a504d60406e4c6f915
+  data.tar.gz: 80eb120f913a93d90f855442ab0bf8fc13bbec222279dec77340979a8cc8f024
 SHA512:
-  metadata.gz: 486419f39b00d0f8545671d597b7e7832a804545ee40d78bec76a6e46edc68632f16465a7745d0eb4b5bf94fc4612b753134c2c756bdf27ed1c477b71622d827
-  data.tar.gz: 0bc257bddd171c211d20c1424626a67487387094a43e0e57dd8a7bf49b3923caf4f4947c73ce44e33c98ae7b6443879aba603b44749439d39b8caa38ac9d31f9
+  metadata.gz: 8afcf774571ed28b0e90b631ebfb88e91812c9494f2bef4c3b1d36dc4726514c7fb21ff22f6c9accd5331f214a5f5f12826b5d1d07a6868fb39a6154d016a0f7
+  data.tar.gz: 7b3bf8f227f97efb5e4a6cb8d80d9e5ef4a2c1f29e8978fadb95597b419010f1abeaf8650bdbc533389fd09746aeae597fc97447ec2b7e46507f36cff180dc58

data/.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Unit Tests
+
+on: [pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ["2.7", "2.6", "2.5"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Configure bundler without 'vscode'
+      run: bundle config set --local without vscode
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake test
+      env:
+        GIT_AUTHOR_NAME: flexmock CI Git Identity
+        GIT_AUTHOR_EMAIL: flexmock@github.actions
+        GIT_COMMITTER_NAME: flexmock CI Git Identity
+        GIT_COMMITTER_EMAIL: flexmock@github.actions

data/.travis.yml

@@ -1,10 +1,31 @@
 language: ruby
 rvm:
-  - '2.0'
-  - '2.1'
-  - '2.2'
-  - 2.3.1
-  - jruby-9.1.2.0
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - ruby-head
+
+matrix:
+  include:
+    - rvm: jruby-9.1.17.0
+      jdk: openjdk8
+      name: "JRuby 9.1"
+    - rvm: jruby-9.2.11.1
+      jdk: openjdk11
+      name: "JRuby 9.2"
+
+  allow_failures:
+    - rvm: ruby-head
+    # Revisit when fixing https://github.com/jruby/jruby/issues/4678
+    - name: "JRuby 9.2"
+  fast_finish: true
+
+env:
+  global:
+    - JRUBY_OPTS="--debug"
 
 script:
     - rake test

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 

data/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Sylvain Joyeux
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,9 +1,9 @@
 # Flex Mock -- Making Mocking Easy
 
 [![Build Status](https://travis-ci.org/doudou/flexmock.svg?branch=master)](https://travis-ci.org/doudou/flexmock)
-[![Gem Version](https://badge.fury.io/rb/flexmock.svg)](http://badge.fury.io/rb/flexmock)
+[![Gem Version](https://badge.fury.io/rb/flexmock.svg)](https://badge.fury.io/rb/flexmock)
 [![Coverage Status](https://coveralls.io/repos/doudou/flexmock/badge.svg?branch=master&service=github)](https://coveralls.io/github/doudou/flexmock?branch=master)
-[![Documentation](http://b.repl.ca/v1/yard-docs-blue.png)](http://rubydoc.info/gems/flexmock/frames)
+[![API Documentation](http://img.shields.io/badge/yard-docs-blue.svg)](https://rubydoc.info/gems/flexmock/frames)
 
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
@@ -22,6 +22,13 @@ Only significant changes (new APIs, deprecated APIs or backward-compatible
 changes) are documented here, a.k.a. minor or major version bumps. If you want a
 detailed changelog, go over the commit log in github (it's pretty low-traffic)
 
+2.3.0:
+ - implemented validation of call arity for partial mocks. By setting
+     FlexMock.partials_verify_signatures = true
+   flexmock will verify on partials that the number of arguments, and the
+   keyword arguments passed to the mocked call match the existing method's
+   signature
+
 2.2.0:
 
  - #new_instances now mocks the #initialize method instead of mocking after the
@@ -938,7 +945,7 @@ MiniTest for asserting that mocked methods are actually called.
   additional validations on supplied arguments. Default is no
   additional validations.
 
-* <b>on: <em>n</em>
+* <b>on: <em>n</em></b>
 
   Only apply the additional validations on the <em>n</em>'th
   invocation of the matching method. Default is apply additional

data/doc/index.rdoc

@@ -4,20 +4,20 @@ FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
 This is the API documentation site for flexmock. You can find the user
-documentation at http://github.com/jimweirich/flexmock
+documentation at http://github.com/doudou/flexmock
 
 == Links
 
-* <b>User Guide</b> -- http://github.com/jimweirich/flexmock
-* <b>API Documents</b> -- http://flexmock.rubyforge.org
+* <b>User Guide</b> -- http://github.com/doudou/flexmock
 * <b>RubyGems</b>   -- Install with: `gem install flexmock`
-* <b>Source</b> -- https://github.com/jimweirich/flexmock
-* <b>Bug Reports / Issue Tracking</b> -- https://github.com/jimweirich/flexmock/issues
-* <b>Continuous Integration</b> -- http://travis-ci.org/#!/jimweirich/flexmock
+* <b>Source</b> -- https://github.com/doudou/flexmock
+* <b>Bug Reports / Issue Tracking</b> -- https://github.com/doudou/flexmock/issues
+* <b>Continuous Integration</b> -- http://travis-ci.org/#!/doudou/flexmock
 
 == License
 
 Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
+Copyright 2013-2020 by Sylvain Joyeux (sylvain.joyeux@m4x.org)
 All rights reserved.
 
 Permission is granted for use, copying, modification, distribution,

data/flexmock.gemspec

@@ -10,13 +10,13 @@ spec = Gem::Specification.new do |s|
     interface is simple, it is very flexible.
   }
 
-  s.required_ruby_version = ">= 2.0"
+  s.required_ruby_version = ">= 2.2"
 
   s.license = 'MIT'
 
   #### Dependencies and requirements.
 
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', ">= 5.0"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov', '>= 0.11.0'
   s.add_development_dependency 'coveralls'

data/lib/flexmock/core.rb

@@ -45,28 +45,59 @@ class FlexMock
   include Ordering
 
   attr_reader :flexmock_name
-  attr_accessor :flexmock_container
+  attr_reader :flexmock_container_stack
 
   class << self
     attr_accessor :partials_are_based
+    attr_accessor :partials_verify_signatures
   end
   self.partials_are_based = false
+  self.partials_verify_signatures = false
+
+  # Null object for {#parent_mock}
+  class NullParentMock
+    def flexmock_expectations_for(sym)
+    end
+  end
 
   # Create a FlexMock object with the given name.  The name is used in
   # error messages.  If no container is given, create a new, one-off
   # container for this mock.
-  def initialize(name="unknown", container=nil)
+  def initialize(name="unknown", container=nil, parent: nil)
     @flexmock_name = name
     @flexmock_closed = false
+    @flexmock_container_stack = Array.new
     @expectations = Hash.new
-    @ignore_missing = false
     @verified = false
     @calls = []
     @base_class = nil
+    if parent
+      @ignore_missing = parent.ignore_missing?
+      @parent_mock = parent
+    else
+      @ignore_missing = false
+      @parent_mock = NullParentMock.new
+    end
     container = UseContainer.new if container.nil?
     container.flexmock_remember(self)
   end
 
+  def ignore_missing?
+    @ignore_missing
+  end
+
+  def flexmock_container
+    flexmock_container_stack.last
+  end
+
+  def push_flexmock_container(container)
+    flexmock_container_stack.push(container)
+  end
+
+  def pop_flexmock_container
+    flexmock_container_stack.pop
+  end
+
   # Return the inspection string for a mock.
   def inspect
     "<FlexMock:#{flexmock_name}>"
@@ -115,8 +146,8 @@ class FlexMock
     flexmock_wrap do
       if flexmock_closed?
         FlexMock.undefined
-      elsif handler = @expectations[sym]
-        handler.call(enhanced_args, call_record)
+      elsif exp = flexmock_expectations_for(sym)
+        exp.call(enhanced_args, call_record)
       elsif @base_class && @base_class.flexmock_defined?(sym)
         FlexMock.undefined
       elsif @ignore_missing
@@ -137,13 +168,14 @@ class FlexMock
 
   # Find the mock expectation for method sym and arguments.
   def flexmock_find_expectation(method_name, *args) # :nodoc:
-    exp = @expectations[method_name]
-    exp ? exp.find_expectation(*args) : nil
+    if exp = flexmock_expectations_for(method_name)
+      exp.find_expectation(*args)
+    end
   end
 
   # Return the expectation director for a method name.
   def flexmock_expectations_for(method_name) # :nodoc:
-    @expectations[method_name]
+    @expectations[method_name] || @parent_mock.flexmock_expectations_for(method_name)
   end
 
   def flexmock_base_class
@@ -153,8 +185,10 @@ class FlexMock
   def flexmock_based_on(base_class)
     @base_class = base_class
     if base_class <= Kernel
-      should_receive(:class => base_class)
-      should_receive(:kind_of?).and_return { |against| base_class <= against }
+      if self.class != base_class
+        should_receive(:class => base_class)
+        should_receive(:kind_of?).and_return { |against| base_class <= against }
+      end
     end
   end
 
@@ -179,9 +213,9 @@ class FlexMock
 
   # Override the built-in +method+ to include the mocked methods.
   def method(method_name)
-    @expectations[method_name] || super
+    flexmock_expectations_for(method_name) || super
   rescue NameError => ex
-    if @ignore_missing
+    if ignore_missing?
       proc { FlexMock.undefined }
     else
       raise ex
@@ -211,15 +245,22 @@ class FlexMock
     flexmock_define_expectation(caller, *args)
   end
 
+  ON_RUBY_20 = (RUBY_VERSION =~ /^2\.0\./)
+
   # Using +location+, define the expectations specified by +args+.
   def flexmock_define_expectation(location, *args)
     @last_expectation = EXP_BUILDER.parse_should_args(self, args) do |method_name|
-      @expectations[method_name] ||= ExpectationDirector.new(method_name)
+      exp = flexmock_expectations_for(method_name) || ExpectationDirector.new(method_name)
+      @expectations[method_name] = exp
       result = Expectation.new(self, method_name, location)
-      @expectations[method_name] << result
-      override_existing_method(method_name) if flexmock_respond_to?(method_name)
-      result = ExplicitNeeded.new(result, method_name, @base_class) if
-        @base_class && ! @base_class.flexmock_defined?(method_name)
+      exp << result
+      override_existing_method(method_name) if flexmock_respond_to?(method_name, true)
+
+      if @base_class && !@base_class.flexmock_defined?(method_name)
+        if !ON_RUBY_20 || !@base_class.ancestors.include?(Class)
+          result = ExplicitNeeded.new(result, method_name, @base_class) 
+        end
+      end
       result
     end
   end

data/lib/flexmock/expectation.rb

@@ -38,6 +38,7 @@ class FlexMock
       @location = location
       @expected_args = nil
       @count_validators = []
+      @signature_validator = SignatureValidator.new(self)
       @count_validator_class = ExactCountValidator
       @actual_count = 0
       @return_value = nil
@@ -65,6 +66,9 @@ class FlexMock
       @count_validators.each do |validator|
         result << validator.describe
       end
+      if !@signature_validator.null?
+        result << @signature_validator.describe
+      end
       result
     end
 
@@ -79,11 +83,18 @@ class FlexMock
       FlexMock.framework_adapter.check(e.message) { false }
     end
 
+    def validate_signature(args)
+      @signature_validator.validate(args)
+    rescue SignatureValidator::ValidationFailed => e
+      FlexMock.framework_adapter.check(e.message) { false }
+    end
+
     # Verify the current call with the given arguments matches the
     # expectations recorded in this object.
     def verify_call(*args)
       validate_eligible
       validate_order
+      validate_signature(args)
       @actual_count += 1
       perform_yielding(args)
       return_value(args)
@@ -132,11 +143,6 @@ class FlexMock
       @count_validators.all? { |v| v.eligible?(@actual_count) }
     end
 
-    # Is this expectation constrained by any call counts?
-    def call_count_constrained?
-      ! @count_validators.empty?
-    end
-
     # Validate that the order
     def validate_order
       if @order_number
@@ -186,6 +192,28 @@ class FlexMock
       self
     end
 
+    # Validate general parameters on the call signature
+    def with_signature(
+        required_arguments: 0, optional_arguments: 0, splat: false,
+        required_keyword_arguments: [], optional_keyword_arguments: [], keyword_splat: false)
+      @signature_validator = SignatureValidator.new(
+          self,
+          required_arguments: required_arguments,
+          optional_arguments: optional_arguments,
+          splat: splat,
+          required_keyword_arguments: required_keyword_arguments,
+          optional_keyword_arguments: optional_keyword_arguments,
+          keyword_splat: keyword_splat)
+      self
+    end
+
+    # Validate that the passed arguments match the method signature from the
+    # given instance method
+    def with_signature_matching(instance_method)
+      @signature_validator = SignatureValidator.from_instance_method(self, instance_method)
+      self
+    end
+
     # :call-seq:
     #   and_return(value)
     #   and_return(value, value, ...)

data/lib/flexmock/expectation_builder.rb

@@ -55,7 +55,7 @@ class FlexMock
       elsif names.size > 1
         create_demeter_chain(mock, names)
       else
-        fail "Empty list of names"
+        fail ArgumentError, "Empty list of names"
       end
     end
 

data/lib/flexmock/expectation_director.rb

@@ -40,7 +40,9 @@ class FlexMock
       call_record.expectation = exp if call_record
       FlexMock.check(
         proc { "no matching handler found for " +
-               FlexMock.format_call(@sym, args) }
+               FlexMock.format_call(@sym, args) +
+               "\nDefined expectations:\n  " +
+               @expectations.map(&:description).join("\n  ") }
       ) { !exp.nil? }
       returned_value = exp.verify_call(*args)
       returned_value

data/lib/flexmock/explicit_needed.rb

@@ -29,8 +29,10 @@ class FlexMock
       @expectation.mock = m
     end
 
+    WHITELIST = [:with_signature_matching]
+
     def method_missing(sym, *args, &block)
-      if explicit?
+      if explicit? || WHITELIST.include?(sym)
         @expectation.send(sym, *args, &block)
       else
         fail NoMethodError, "Cannot stub methods not defined by the base class\n" +

data/lib/flexmock/minitest_integration.rb

@@ -98,7 +98,11 @@ class FlexMock
     end
 
     def assertion_failed_error
-      MiniTest::Assertion
+      if defined?(::Minitest)
+        ::Minitest::Assertion
+      else
+        MiniTest::Assertion
+      end
     end
 
     def check_failed_error

data/lib/flexmock/mock_container.rb

@@ -52,6 +52,7 @@ class FlexMock
     def flexmock_close
       flexmock_created_mocks.each do |m|
         m.flexmock_teardown
+        m.pop_flexmock_container
       end
       @flexmock_created_mocks = []
     end
@@ -127,7 +128,7 @@ class FlexMock
     def flexmock_remember(mocking_object)
       @flexmock_created_mocks ||= []
       @flexmock_created_mocks << mocking_object
-      mocking_object.flexmock_container = self
+      mocking_object.push_flexmock_container(self)
       mocking_object
     end
 

data/lib/flexmock/partial_mock.rb

@@ -28,47 +28,85 @@ class FlexMock
 
     attr_reader :mock
 
-    ProxyBox = Struct.new :proxy
+    # Boxing of the flexmock proxy
+    #
+    # It is managed as a stack in order to allow to setup containers recursively
+    # (as e.g. FlexMock.use( ... ) checks)
+    class ProxyBox
+      attr_reader :stack
+
+      Element = Struct.new :proxy, :container
+
+      def initialize
+        @stack = [Element.new]
+      end
+
+      # Tests whether the given container is the one on which the current proxy
+      # acts
+      def container
+        stack.last.container
+      end
+
+      def proxy
+        stack.last.proxy
+      end
+
+      def push(proxy, container)
+        stack.push(Element.new(proxy, container))
+      end
+
+      def pop
+        if !stack.empty?
+          stack.pop
+        end
+      end
+
+      def empty?
+        stack.size == 1
+      end
+    end
 
     # Make a partial mock proxy and install it on the target +obj+.
     def self.make_proxy_for(obj, container, name, safe_mode)
       name ||= "flexmock(#{obj.class.to_s})"
-      if ! proxy_defined_on?(obj)
-        mock = FlexMock.new(name, container)
-        proxy = PartialMockProxy.new(obj, mock, safe_mode)
-        if obj.instance_variable_defined?("@flexmock_proxy")
-          obj.instance_variable_get("@flexmock_proxy").proxy = proxy
-        else
-          obj.instance_variable_set("@flexmock_proxy", ProxyBox.new(proxy))
-        end
+      if !obj.instance_variable_defined?("@flexmock_proxy")
+        proxy_box = obj.instance_variable_set("@flexmock_proxy", ProxyBox.new)
+      else
+        proxy_box = obj.instance_variable_get("@flexmock_proxy")
       end
-      obj.instance_variable_get("@flexmock_proxy").proxy
-    end
 
-    # Is there a mock proxy defined on the domain object?
-    def self.proxy_defined_on?(obj)
-      obj.instance_variable_defined?("@flexmock_proxy") &&
-        obj.instance_variable_get("@flexmock_proxy").proxy
+      if proxy_box.container != container
+        if !proxy_box.empty?
+          parent_proxy, _ = proxy_box.proxy
+          parent_mock = parent_proxy.mock
+        end
+
+        mock  = FlexMock.new(name, container, parent: parent_mock)
+        proxy = PartialMockProxy.new(obj, mock, safe_mode, parent: parent_proxy)
+        proxy_box.push(proxy, container)
+      end
+      proxy_box.proxy
     end
 
     # The following methods are added to partial mocks so that they
     # can act like a mock.
 
     MOCK_METHODS = [
-      :should_receive, :new_instances,
+      :should_receive, :new_instances, :should_expect,
       :should_receive_with_location,
       :flexmock_get,   :flexmock_teardown, :flexmock_verify,
-      :flexmock_received?, :flexmock_calls, :flexmock_find_expectation
+      :flexmock_received?, :flexmock_calls, :flexmock_find_expectation,
+      :invoke_original
     ]
 
     # Initialize a PartialMockProxy object.
-    def initialize(obj, mock, safe_mode)
+    def initialize(obj, mock, safe_mode, parent: nil)
       @obj = obj
       @mock = mock
-      @method_definitions = {}
-      @methods_proxied = []
       @proxy_definition_module = nil
+      @parent = parent
       @initialize_override = nil
+
       unless safe_mode
         add_mock_method(:should_receive)
         MOCK_METHODS.each do |sym|
@@ -84,6 +122,14 @@ class FlexMock
       @mock
     end
 
+    def push_flexmock_container(container)
+      @mock.push_flexmock_container(container)
+    end
+
+    def pop_flexmock_container
+      @mock.pop_flexmock_container
+    end
+
     # :call-seq:
     #    should_receive(:method_name)
     #    should_receive(:method1, method2, ...)
@@ -108,12 +154,66 @@ class FlexMock
       flexmock_define_expectation(caller, *args)
     end
 
+    def should_expect(*args)
+      yield Recorder.new(self)
+    end
+
+    # Invoke the original of a mocked method
+    #
+    # Usually called in a #and_return statement
+    def invoke_original(m, *args, &block)
+      if block
+        args << block
+      end
+      flexmock_invoke_original(m, args)
+    end
+
+    # Whether the given method's original definition has been stored
+    def find_original_method(m)
+      it = @obj.method(m)
+      while it && (it.owner != @proxy_definition_module)
+        it = it.super_method
+      end
+
+      return unless it
+      while it && it.owner.kind_of?(ProxyDefinitionModule)
+        it = it.super_method
+      end
+      it
+    rescue NameError => e
+      raise unless e.name == m
+    end
+
+    # Whether the given method's original definition has been stored
+    def original_method(m)
+      unless (m = find_original_method(m))
+        raise ArgumentError, "no original method for #{m}"
+      end
+      m
+    end
+
+    # Whether the given method's original definition has been stored
+    def has_original_method?(m)
+      find_original_method(m)
+    end
+
+    # Whether the given method is already being proxied
+    def has_proxied_method?(m)
+      @proxy_definition_module &&
+          @proxy_definition_module.method_defined?(m)
+    end
+
     def flexmock_define_expectation(location, *args)
       EXP_BUILDER.parse_should_args(self, args) do |method_name|
-        unless @methods_proxied.include?(method_name)
-          hide_existing_method(method_name)
+        if !has_proxied_method?(method_name)
+          define_proxy_method(method_name)
         end
         ex = @mock.flexmock_define_expectation(location, method_name)
+        if FlexMock.partials_verify_signatures
+          if (existing_method = find_original_method(method_name))
+            ex.with_signature_matching(existing_method)
+          end
+        end
         ex.mock = self
         ex
       end
@@ -124,7 +224,6 @@ class FlexMock
     end
 
     def add_mock_method(method_name)
-      stow_existing_definition(method_name)
       proxy_module_eval do
         define_method(method_name) { |*args, &block|
           proxy = __flexmock_proxy or
@@ -233,12 +332,12 @@ class FlexMock
     # Invoke the original definition of method on the object supported by
     # the stub.
     def flexmock_invoke_original(method, args)
-      if original_method = @method_definitions[method]
+      if (original_method = find_original_method(method))
         if Proc === args.last
           block = args.last
           args = args[0..-2]
         end
-        original_method.bind(@obj).call(*args, &block)
+        original_method.call(*args, &block)
       else
         @obj.__send__(:method_missing, method, *args, &block)
       end
@@ -262,7 +361,7 @@ class FlexMock
         end
         if @obj.instance_variable_defined?(:@flexmock_proxy) &&
             (box = @obj.instance_variable_get(:@flexmock_proxy))
-          box.proxy = nil
+          box.pop
         end
         @obj = nil
       end
@@ -311,11 +410,14 @@ class FlexMock
       target_singleton_class.class_eval(*args, &block)
     end
 
+    class ProxyDefinitionModule < Module
+    end
+
     # Evaluate a block into the module we use to define the proxy methods
     def proxy_module_eval(*args, &block)
       if !@proxy_definition_module
         obj = @obj
-        @proxy_definition_module = m = Module.new do
+        @proxy_definition_module = m = ProxyDefinitionModule.new do
           define_method("__flexmock_proxy") do
             if box = obj.instance_variable_get(:@flexmock_proxy)
               box.proxy
@@ -334,20 +436,9 @@ class FlexMock
     # not a singleton, all we need to do is override it with our own
     # singleton.
     def hide_existing_method(method_name)
-      stow_existing_definition(method_name)
       define_proxy_method(method_name)
     end
 
-    # Stow the existing method definition so that it can be recovered
-    # later.
-    def stow_existing_definition(method_name)
-      if !@methods_proxied.include?(method_name)
-        @method_definitions[method_name] = target_class_eval { instance_method(method_name) }
-        @methods_proxied << method_name
-      end
-    rescue NameError
-    end
-
     # Define a proxy method that forwards to our mock object.  The
     # proxy method is defined as a singleton method on the object
     # being mocked.
@@ -372,6 +463,5 @@ class FlexMock
     def detached?
       @obj.nil?
     end
-
   end
 end

data/lib/flexmock/test_unit_integration.rb

@@ -51,7 +51,7 @@ class FlexMock
         @assertions = 0
     end
 
-    def make_assertion(msg, &block)
+    def make_assertion(msg, backtrace = caller, &block)
       unless yield
         msg = msg.call if msg.is_a?(Proc)
         assert(false, msg)
@@ -68,7 +68,7 @@ class FlexMock
     def assertion_failed_error
       defined?(Test::Unit::AssertionFailedError) ?
         Test::Unit::AssertionFailedError :
-        MiniTest::Assertion
+        Minitest::Assertion
     end
 
     def check_failed_error

data/lib/flexmock/test_unit_testcase_extensions.rb

@@ -30,8 +30,8 @@ class FlexMock
   end
 end
 
-if defined?(MiniTest)
-  module MiniTest
+if defined?(Minitest)
+  module Minitest
     class Unit
       class TestCase
         FlexMock::GenericTestCase.define_extensions_on(self)

data/lib/flexmock/validators.rb

@@ -9,6 +9,7 @@
 # above copyright notice is included.
 #+++
 
+require 'set'
 require 'flexmock/noop'
 require 'flexmock/spy_describers'
 
@@ -136,4 +137,180 @@ class FlexMock
       "At most #{@limit}"
     end
   end
+
+  # Validate that the call matches a given signature
+  #
+  # The validator created by {#initialize} matches any method call
+  class SignatureValidator
+    class ValidationFailed < RuntimeError
+    end
+
+    # The number of required arguments
+    attr_reader :required_arguments
+    # The number of optional arguments
+    attr_reader :optional_arguments
+    # Whether there is a positional argument splat
+    def splat?
+      @splat
+    end
+    # The names of required keyword arguments
+    # @return [Set<Symbol>]
+    attr_reader :required_keyword_arguments
+    # The names of optional keyword arguments
+    # @return [Set<Symbol>]
+    attr_reader :optional_keyword_arguments
+    # Whether there is a splat for keyword arguments (double-star)
+    def keyword_splat?
+      @keyword_splat
+    end
+
+    # Whether this method may have keyword arguments
+    def expects_keyword_arguments?
+      keyword_splat? || !required_keyword_arguments.empty? || !optional_keyword_arguments.empty?
+    end
+
+    # Whether this method may have keyword arguments
+    def requires_keyword_arguments?
+      !required_keyword_arguments.empty?
+    end
+
+    def initialize(
+        expectation,
+        required_arguments: 0,
+        optional_arguments: 0,
+        splat: true,
+        required_keyword_arguments: [],
+        optional_keyword_arguments: [],
+        keyword_splat: true)
+      @exp = expectation
+      @required_arguments = required_arguments
+      @optional_arguments = optional_arguments
+      @required_keyword_arguments = required_keyword_arguments.to_set
+      @optional_keyword_arguments = optional_keyword_arguments.to_set
+      @splat = splat
+      @keyword_splat = keyword_splat
+    end
+
+    # Whether this tests anything
+    #
+    # It will return if this validator would validate any set of arguments
+    def null?
+      splat? && keyword_splat?
+    end
+
+    def describe
+      ".with_signature(
+          required_arguments: #{self.required_arguments},
+          optional_arguments: #{self.optional_arguments},
+          required_keyword_arguments: #{self.required_keyword_arguments.to_a},
+          optional_keyword_arguments: #{self.optional_keyword_arguments.to_a},
+          splat: #{self.splat?},
+          keyword_splat: #{self.keyword_splat?})"
+    end
+
+    # Validates whether the given arguments match the expected signature
+    #
+    # @param [Array] args
+    # @raise ValidationFailed
+    def validate(args)
+      args = args.dup
+      kw_args = Hash.new
+
+      last_is_proc = false
+      begin
+        if args.last.kind_of?(Proc)
+          args.pop
+          last_is_proc = true
+        end
+      rescue NoMethodError
+      end
+
+      last_is_kw_hash = false
+      if expects_keyword_arguments?
+        last_is_kw_hash =
+          begin
+            args.last.kind_of?(Hash)
+          rescue NoMethodError
+          end
+
+        if last_is_kw_hash
+          kw_args = args.pop
+        elsif requires_keyword_arguments?
+          raise ValidationFailed, "#{@exp} expects keyword arguments but none were provided"
+        end
+      end
+
+      # There is currently no way to disambiguate "given a block" from "given a
+      # proc as last argument" ... give some leeway in this case
+      positional_count = args.size
+
+      if required_arguments > positional_count
+        if requires_keyword_arguments?
+          raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{positional_count}"
+        end
+
+        if (required_arguments - positional_count) == 1 && (last_is_kw_hash || last_is_proc)
+          if last_is_kw_hash
+            last_is_kw_hash = false
+            kw_args = Hash.new
+          else
+            last_is_proc = false
+          end
+          positional_count += 1
+        elsif (required_arguments - positional_count) == 2 && (last_is_kw_hash && last_is_proc)
+          last_is_kw_hash = false
+          kw_args = Hash.new
+          last_is_proc = false
+          positional_count += 2
+        else
+          raise ValidationFailed, "#{@exp} expects at least #{required_arguments} positional arguments but got only #{positional_count}"
+        end
+      end
+
+      if !splat? && (required_arguments + optional_arguments) < positional_count
+        if !last_is_proc || (required_arguments + optional_arguments) < positional_count - 1
+          raise ValidationFailed, "#{@exp} expects at most #{required_arguments + optional_arguments} positional arguments but got #{positional_count}"
+        end
+      end
+
+      missing_keyword_arguments = required_keyword_arguments.
+        find_all { |k| !kw_args.has_key?(k) }
+      if !missing_keyword_arguments.empty?
+        raise ValidationFailed, "#{@exp} missing required keyword arguments #{missing_keyword_arguments.map(&:to_s).sort.join(", ")}"
+      end
+      if !keyword_splat?
+        kw_args.each_key do |k|
+          if !optional_keyword_arguments.include?(k) && !required_keyword_arguments.include?(k)
+            raise ValidationFailed, "#{@exp} given unexpected keyword argument #{k}"
+          end
+        end
+      end
+    end
+
+    # Create a validator that represents the signature of an existing method
+    def self.from_instance_method(exp, instance_method)
+      required_arguments, optional_arguments, splat = 0, 0, false
+      required_keyword_arguments, optional_keyword_arguments, keyword_splat = Set.new, Set.new, false
+      instance_method.parameters.each do |type, name|
+        case type
+        when :req then required_arguments += 1
+        when :opt then optional_arguments += 1
+        when :rest then splat = true
+        when :keyreq then required_keyword_arguments << name
+        when :key then optional_keyword_arguments << name
+        when :keyrest then keyword_splat = true
+        when :block
+        else raise ArgumentError, "cannot interpret parameter type #{type}"
+        end
+      end
+      new(exp,
+          required_arguments: required_arguments,
+          optional_arguments: optional_arguments,
+          splat: splat,
+          required_keyword_arguments: required_keyword_arguments,
+          optional_keyword_arguments: optional_keyword_arguments,
+          keyword_splat: keyword_splat)
+    end
+  end
 end
+

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.2.1"
+    VERSION = "2.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.8
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2023-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,12 +76,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".autotest"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".togglerc"
 - ".travis.yml"
 - ".yardopts"
 - CHANGES
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - doc/GoogleExample.rdoc
@@ -177,15 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing