mocktail 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd08e4a44a711e7fc26677b99ebc6c98a841c4513cbb59cf85fe863d25d78b41
-  data.tar.gz: 796387b2e7d00be4819766f3fd99b6e8169371d9247667562c487150f952a10b
+  metadata.gz: 5f97cc51c4c07f73a4d9b5adeeba1d9f6d36c70fa29d6061bb28df91948019c3
+  data.tar.gz: a9471b225f4d03664485993c6976e3368c49f7771ac4db11b59c4080153fe8ad
 SHA512:
-  metadata.gz: bc861430dcb25e5a77d438e6c86b07cd91486c83884ba2f3ce8ee5c997de7629da11b473ac5347bb73b55bcc87ca28efb3e570ac431f61a4b9252e5abd6453a0
-  data.tar.gz: 8008dda26649d9a1aa75dc23740181a88daadc3ea1d707059e25f4ffd1a2a0d874e944ae9ae31c1ce7118caccaae5ada68ebfc89bf67b0972dab979ee02542f0
+  metadata.gz: 498fbe4ee233f7a248c5898972ed8691a512f17c5d7bed828943467f22a4d9f06fcf354d2155afd26f019685fe5636a3f0ff6ddf186b32914e39d9b0db23e538
+  data.tar.gz: 9753fb8c3e5db0e325e32a7f3693e0afd51a2cdfd349a9b690b256f7aa77c4ca5e1739065c5b37c1d89fca0db73ebf8c38270518789977c2c2a770c2e88086f1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 3.0.1
+
+* Fix arity validation staying disabled after a `stubs` or `verify` block with
+  `ignore_arity: true` raises
+* Fix `ArgumentError: unknown keyword` when a replaced class's `new` or class
+  method takes an options hash and is called with brace-less keywords
+  [#20](https://github.com/testdouble/mocktail/pull/20)
+* Replaced `new` and class methods with no keyword parameters now accept
+  keyword-style calls as a trailing hash, as real Ruby does, instead of raising
+  `ArgumentError`
+
 # 3.0.0
 
 * **Breaking change** - Drop support for Ruby 3.0, which is EOL

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mocktail (3.0.0)
+    mocktail (3.0.1)
       sorbet-eraser (~> 0.3.1)
       sorbet-runtime (~> 0.5.9204)
 

data/lib/mocktail/debug.rb

@@ -32,7 +32,7 @@ module Mocktail
       approved_call_sites = [
         /fulfills_stubbing.rb:(16|20)/,
         /validates_arguments.rb:(18|23)/,
-        /validates_arguments.rb:(21|26)/
+        /validates_arguments.rb:(23|28)/
       ]
       if internal_call_sites.any? && approved_call_sites.none? { |approved_call_site|
         internal_call_sites.first&.match?(approved_call_site)

data/lib/mocktail/handles_dry_call/validates_arguments.rb

@@ -17,10 +17,13 @@ module Mocktail
     def self.optional(disable, &blk)
       return blk.call unless disable
 
+      previous = disabled?
       disable!
-      ret = blk.call
-      enable!
-      ret
+      begin
+        blk.call
+      ensure
+        Thread.current[:mocktail_arity_validation_disabled] = previous
+      end
     end
 
     def initialize

data/lib/mocktail/handles_dry_new_call.rb

@@ -1,3 +1,5 @@
+require_relative "share/folds_keywords_into_options_hash"
+
 module Mocktail
   class HandlesDryNewCall
     extend T::Sig
@@ -7,9 +9,12 @@ module Mocktail
       @logs_call = LogsCall.new
       @fulfills_stubbing = FulfillsStubbing.new
       @imitates_type = ImitatesType.new
+      @folds_keywords_into_options_hash = FoldsKeywordsIntoOptionsHash.new
     end
 
     def handle(type, args, kwargs, block)
+      args, kwargs = @folds_keywords_into_options_hash.fold(type.instance_method(:initialize), args, kwargs)
+
       @validates_arguments.validate(Call.new(
         original_method: type.instance_method(:initialize),
         args: args,

data/lib/mocktail/replaces_type/redefines_singleton_methods.rb

@@ -1,9 +1,12 @@
+require_relative "../share/folds_keywords_into_options_hash"
+
 module Mocktail
   class RedefinesSingletonMethods
     extend T::Sig
 
     def initialize
       @handles_dry_call = HandlesDryCall.new
+      @folds_keywords_into_options_hash = FoldsKeywordsIntoOptionsHash.new
     end
 
     def redefine(type)
@@ -16,10 +19,12 @@ module Mocktail
 
       declare_singleton_method_missing_errors!(type)
       handles_dry_call = @handles_dry_call
+      folds_keywords_into_options_hash = @folds_keywords_into_options_hash
       type_replacement.replacement_methods = type_replacement.original_methods&.map { |original_method|
         type.singleton_class.send(:undef_method, original_method.name)
         type.define_singleton_method original_method.name, ->(*args, **kwargs, &block) {
           if TopShelf.instance.singleton_methods_replaced?(type)
+            args, kwargs = folds_keywords_into_options_hash.fold(original_method, args, kwargs)
             handles_dry_call.handle(Call.new(
               singleton: true,
               double: type,

data/lib/mocktail/share/folds_keywords_into_options_hash.rb

@@ -0,0 +1,22 @@
+module Mocktail
+  class FoldsKeywordsIntoOptionsHash
+    extend T::Sig
+
+    KEYWORD_PARAM_TYPES = [:key, :keyreq, :keyrest, :nokey].freeze
+
+    def initialize
+      @grabs_original_method_parameters = GrabsOriginalMethodParameters.new
+    end
+
+    # Ruby 3 passes keywords to a method with no keyword params as a trailing
+    # positional hash, but our generic (*args, **kwargs) lambdas always split
+    # them out, so fold them back in to match what the real method would see
+
+    def fold(original_method, args, kwargs)
+      return [args, kwargs] if kwargs.empty? || original_method.nil?
+      return [args, kwargs] if @grabs_original_method_parameters.grab(original_method).any? { |type, _| KEYWORD_PARAM_TYPES.include?(type) }
+
+      [[*args, kwargs], {}]
+    end
+  end
+end

data/lib/mocktail/sorbet/mocktail/debug.rb

@@ -34,7 +34,7 @@ module Mocktail
       approved_call_sites = [
         /fulfills_stubbing.rb:(16|20)/,
         /validates_arguments.rb:(18|23)/,
-        /validates_arguments.rb:(21|26)/
+        /validates_arguments.rb:(23|28)/
       ]
       if internal_call_sites.any? && approved_call_sites.none? { |approved_call_site|
         internal_call_sites.first&.match?(approved_call_site)

data/lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb

@@ -22,10 +22,13 @@ module Mocktail
     def self.optional(disable, &blk)
       return blk.call unless disable
 
+      previous = disabled?
       disable!
-      ret = blk.call
-      enable!
-      ret
+      begin
+        blk.call
+      ensure
+        Thread.current[:mocktail_arity_validation_disabled] = previous
+      end
     end
 
     sig { void }

data/lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb

@@ -1,5 +1,7 @@
 # typed: strict
 
+require_relative "share/folds_keywords_into_options_hash"
+
 module Mocktail
   class HandlesDryNewCall
     extend T::Sig
@@ -10,10 +12,13 @@ module Mocktail
       @logs_call = T.let(LogsCall.new, LogsCall)
       @fulfills_stubbing = T.let(FulfillsStubbing.new, FulfillsStubbing)
       @imitates_type = T.let(ImitatesType.new, ImitatesType)
+      @folds_keywords_into_options_hash = T.let(FoldsKeywordsIntoOptionsHash.new, FoldsKeywordsIntoOptionsHash)
     end
 
     sig { params(type: T::Class[T.all(T, Object)], args: T::Array[T.anything], kwargs: T::Hash[Symbol, T.anything], block: T.nilable(Proc)).returns(T.anything) }
     def handle(type, args, kwargs, block)
+      args, kwargs = @folds_keywords_into_options_hash.fold(type.instance_method(:initialize), args, kwargs)
+
       @validates_arguments.validate(Call.new(
         original_method: type.instance_method(:initialize),
         args: args,

data/lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb

@@ -1,5 +1,7 @@
 # typed: strict
 
+require_relative "../share/folds_keywords_into_options_hash"
+
 module Mocktail
   class RedefinesSingletonMethods
     extend T::Sig
@@ -7,6 +9,7 @@ module Mocktail
     sig { void }
     def initialize
       @handles_dry_call = T.let(HandlesDryCall.new, HandlesDryCall)
+      @folds_keywords_into_options_hash = T.let(FoldsKeywordsIntoOptionsHash.new, FoldsKeywordsIntoOptionsHash)
     end
 
     sig { params(type: T.any(T::Class[T.anything], Module)).void }
@@ -20,10 +23,12 @@ module Mocktail
 
       declare_singleton_method_missing_errors!(type)
       handles_dry_call = @handles_dry_call
+      folds_keywords_into_options_hash = @folds_keywords_into_options_hash
       type_replacement.replacement_methods = type_replacement.original_methods&.map { |original_method|
         type.singleton_class.send(:undef_method, original_method.name)
         type.define_singleton_method original_method.name, ->(*args, **kwargs, &block) {
           if TopShelf.instance.singleton_methods_replaced?(type)
+            args, kwargs = folds_keywords_into_options_hash.fold(original_method, args, kwargs)
             handles_dry_call.handle(Call.new(
               singleton: true,
               double: type,

data/lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb

@@ -0,0 +1,25 @@
+# typed: strict
+
+module Mocktail
+  class FoldsKeywordsIntoOptionsHash
+    extend T::Sig
+
+    KEYWORD_PARAM_TYPES = T.let([:key, :keyreq, :keyrest, :nokey].freeze, T::Array[Symbol])
+
+    sig { void }
+    def initialize
+      @grabs_original_method_parameters = T.let(GrabsOriginalMethodParameters.new, GrabsOriginalMethodParameters)
+    end
+
+    # Ruby 3 passes keywords to a method with no keyword params as a trailing
+    # positional hash, but our generic (*args, **kwargs) lambdas always split
+    # them out, so fold them back in to match what the real method would see
+    sig { params(original_method: T.nilable(T.any(UnboundMethod, Method)), args: T::Array[T.anything], kwargs: T::Hash[Symbol, T.anything]).returns([T::Array[T.anything], T::Hash[Symbol, T.anything]]) }
+    def fold(original_method, args, kwargs)
+      return [args, kwargs] if kwargs.empty? || original_method.nil?
+      return [args, kwargs] if @grabs_original_method_parameters.grab(original_method).any? { |type, _| KEYWORD_PARAM_TYPES.include?(type) }
+
+      [[*args, kwargs], {}]
+    end
+  end
+end

data/lib/mocktail/sorbet/mocktail/version.rb

@@ -8,5 +8,5 @@ module Mocktail
     Mocktail.send(:remove_const, :VERSION)
   end
 
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/lib/mocktail/version.rb

@@ -6,5 +6,5 @@ module Mocktail
     Mocktail.send(:remove_const, :VERSION)
   end
 
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/rbi/mocktail-pregenerated.rbi

@@ -7,15 +7,10 @@
 
 # typed: true
 
-# DO NOT EDIT MANUALLY
-# This is an autogenerated file for types exported from the `mocktail` gem.
-# Please instead update this file by running `bin/tapioca gem mocktail`.
-
 # The Cabinet stores all thread-local state, so anything that goes here
 # is guaranteed by Mocktail to be local to the currently-running thread
 #
 # source://mocktail//lib/mocktail/sorbet/mocktail/typed.rb#3
-# The Cabinet stores all thread-local state, so anything that goes here
 module Mocktail
   extend ::Mocktail::DSL
 
@@ -25,8 +20,6 @@ module Mocktail
     # don't commit code that relies on it!
     #
     # source://mocktail//lib/mocktail/sorbet/mocktail.rb#149
-    # Stores most transactional state about calls & stubbing configurations
-    # Anything returned by this is undocumented and could change at any time, so
     sig { returns(::Mocktail::Cabinet) }
     def cabinet; end
 
@@ -35,8 +28,6 @@ module Mocktail
     # calls to that method
     #
     # source://mocktail//lib/mocktail/sorbet/mocktail.rb#141
-    # An alias for Mocktail.explain(double).reference.calls
-    # Takes an optional second parameter of the method name to filter only
     sig do
       params(
         double: ::Object,
@@ -76,7 +67,6 @@ module Mocktail
     # stubs its constructor to return that fake the next time klass.new is called
     #
     # source://mocktail//lib/mocktail/sorbet/mocktail.rb#63
-    # Returns an instance of `klass` whose implementation is mocked out AND
     sig do
       type_parameters(:T)
         .params(
@@ -106,7 +96,6 @@ module Mocktail
     # or included will also fake instance methods
     #
     # source://mocktail//lib/mocktail/sorbet/mocktail.rb#111
-    # Replaces every singleton method on `type` with a fake, and when instantiated
     sig { params(type: T.any(::Module, T::Class[T.anything])).void }
     def replace(type); end
 
@@ -207,7 +196,6 @@ class Mocktail::Call < ::T::Struct
   # to redefine the equality methods to compare the values of the attributes.
   #
   # source://mocktail//lib/mocktail/sorbet/mocktail/value/call.rb#27
-  # Because T::Struct compares with referential equality, we need
   sig { params(other: T.nilable(T.anything)).returns(T::Boolean) }
   def ==(other); end
 
@@ -221,7 +209,6 @@ class Mocktail::Call < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -301,14 +288,6 @@ module Mocktail::Debug
     # mocked BasicObject
     #
     # source://mocktail//lib/mocktail/sorbet/mocktail/debug.rb#20
-    # It would be easy and bad for the mocktail lib to call something like
-    #   double == other_double
-    # But if it's a double, that means anyone who stubs that method could change
-    # the internal behavior of the library in unexpected ways (as happened here:
-    # https://github.com/testdouble/mocktail/issues/7 )
-    # For that reason when we run our tests, we also want to blow up if this
-    # happens unintentionally. This works in conjunction with the test
-    # MockingMethodfulClassesTest, because it mocks every defined method on the
     sig { void }
     def guard_against_mocktail_accidentally_calling_mocks_if_debugging!; end
   end
@@ -337,8 +316,6 @@ class Mocktail::DeclaresDryClass
   # mocked methods. YMMV
   #
   # source://mocktail//lib/mocktail/sorbet/mocktail/imitates_type/makes_double/declares_dry_class.rb#55
-  # These have special implementations, but if the user defines
-  # any of them on the object itself, then they'll be replaced with normal
   sig do
     params(
       dry_class: T::Class[::Object],
@@ -392,7 +369,6 @@ class Mocktail::DemoConfig < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -466,7 +442,6 @@ class Mocktail::Double < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -482,7 +457,6 @@ class Mocktail::DoubleData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -615,7 +589,6 @@ class Mocktail::FakeMethodData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -653,6 +626,30 @@ class Mocktail::FindsVerifiableCalls
   def find(recording, demo_config); end
 end
 
+# source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#4
+class Mocktail::FoldsKeywordsIntoOptionsHash
+  # source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#10
+  sig { void }
+  def initialize; end
+
+  # Ruby 3 passes keywords to a method with no keyword params as a trailing
+  # positional hash, but our generic (*args, **kwargs) lambdas always split
+  # them out, so fold them back in to match what the real method would see
+  #
+  # source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#18
+  sig do
+    params(
+      original_method: T.nilable(T.any(::Method, ::UnboundMethod)),
+      args: T::Array[T.anything],
+      kwargs: T::Hash[::Symbol, T.anything]
+    ).returns([T::Array[T.anything], T::Hash[::Symbol, T.anything]])
+  end
+  def fold(original_method, args, kwargs); end
+end
+
+# source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#7
+Mocktail::FoldsKeywordsIntoOptionsHash::KEYWORD_PARAM_TYPES = T.let(T.unsafe(nil), Array)
+
 # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/fulfills_stubbing.rb#7
 class Mocktail::FulfillsStubbing
   # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/fulfills_stubbing.rb#11
@@ -706,10 +703,6 @@ class Mocktail::GrabsOriginalMethodParameters
   # per usual
   #
   # source://mocktail//lib/mocktail/sorbet/mocktail/grabs_original_method_parameters.rb#14
-  # Sorbet wraps the original method in a sig wrapper, so we need to unwrap it.
-  # The value returned from `owner.instance_method(method_name)` does not have
-  # the real parameters values available, as they'll have been erased
-  # If the method isn't wrapped by Sorbet, this will return the #instance_method,
   sig { params(method: T.nilable(T.any(::Method, ::UnboundMethod))).returns(T::Array[T::Array[::Symbol]]) }
   def grab(method); end
 
@@ -731,13 +724,13 @@ class Mocktail::HandlesDryCall
   def handle(dry_call); end
 end
 
-# source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#4
+# source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#6
 class Mocktail::HandlesDryNewCall
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#8
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#10
   sig { void }
   def initialize; end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#16
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#19
   sig do
     params(
       type: T::Class[T.all(::Object, ::T)],
@@ -901,7 +894,6 @@ class Mocktail::Matchers::Base
   # single-argument, though, so that's defaulted here and in #insepct
   #
   # source://mocktail//lib/mocktail/sorbet/mocktail/matchers/base.rb#15
-  # Custom matchers can receive any args, kwargs, or block they want. Usually
   sig { params(expected: ::BasicObject).void }
   def initialize(expected); end
 
@@ -943,15 +935,6 @@ end
 # https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Captor.html
 #
 # source://mocktail//lib/mocktail/sorbet/mocktail/matchers/captor.rb#17
-# Captors are conceptually complex implementations, but with a simple usage/purpose:
-# They are values the user can create and hold onto that will return a matcher
-# and then "capture" the value made by the real call, for later analysis & assertion.
-# Unlike other matchers, these don't make any useful sense for stubbing, but are
-# very useful when asserting complication call verifications
-# The fact the user will need the reference outside the verification call is
-# why this is a top-level method on Mocktail, and not included in the |m| block
-# arg to stubs/verify
-# See Mockito, which is the earliest implementation I know of:
 class Mocktail::Matchers::Captor
   # source://mocktail//lib/mocktail/sorbet/mocktail/matchers/captor.rb#62
   sig { void }
@@ -962,8 +945,6 @@ class Mocktail::Matchers::Captor
   # it needs to think it's being returned whatever parameter is expected
   #
   # source://mocktail//lib/mocktail/sorbet/mocktail/matchers/captor.rb#59
-  # This T.untyped is intentional. Even though a Capture is surely returned,
-  # in order for a verification demonstration to pass its own type check,
   sig { returns(T.untyped) }
   def capture; end
 
@@ -1170,7 +1151,6 @@ class Mocktail::NoExplanationData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1192,7 +1172,6 @@ class Mocktail::Params < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1370,23 +1349,23 @@ class Mocktail::RedefinesNew
   def redefine(type); end
 end
 
-# source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#4
+# source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#6
 class Mocktail::RedefinesSingletonMethods
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#8
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#10
   sig { void }
   def initialize; end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#47
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#52
   sig { params(type: T.any(::Module, T::Class[T.anything])).void }
   def declare_singleton_method_missing_errors!(type); end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#13
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#16
   sig { params(type: T.any(::Module, T::Class[T.anything])).void }
   def redefine(type); end
 
   private
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#72
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#77
   sig { params(method: ::Method).returns(T::Boolean) }
   def sorbet_method_hook?(method); end
 end
@@ -1516,20 +1495,6 @@ class Mocktail::RunsSorbetSigBlocksBeforeReplacement
   # It's very fun and confusing and a great time.
   #
   # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/runs_sorbet_sig_blocks_before_replacement.rb#26
-  # This is necessary because when Sorbet runs a sig block of a singleton
-  # method, it has the net effect of unwrapping/redefining the method. If
-  # we try to use Mocktail.replace(Foo) and Foo.bar has a Sorbet sig block,
-  # then we'll end up with three "versions" of the same method and no way
-  # to keep straight which one == which:
-  #  A - Foo.bar, as defined in the original class
-  #  B - Foo.bar, as redefined by RedefinesSingletonMethods
-  #  C - Foo.bar, as wrapped by sorbet-runtime
-  # Initially, Foo.method(:bar) would == C, but after the type
-  # replacement, it would == B (with a reference back to C as the original),
-  # but after handling a single dry call, our invocation of
-  # GrabsOriginalMethodParameters.grab(Foo.method(:bar)) would invoke the
-  # Sorbet `sig` block, which has the net effect of redefining the method back
-  # to A.
   sig { params(type: T.any(::Module, T::Class[T.anything])).void }
   def run(type); end
 end
@@ -1545,7 +1510,6 @@ class Mocktail::Signature < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1591,37 +1555,30 @@ class Mocktail::StringifiesCall
   private
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#46
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#47
   sig { params(args: T::Array[::Object]).returns(T.nilable(::String)) }
   def argify(args); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#29
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#30
   sig { params(call: ::Mocktail::Call, parens: T::Boolean).returns(T.nilable(::String)) }
   def args_to_s(call, parens: T.unsafe(nil)); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#64
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#65
   sig { params(block: T.nilable(::Proc), anonymous: T::Boolean).returns(T.nilable(::String)) }
   def blockify(block, anonymous:); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#52
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#53
   sig { params(kwargs: T::Hash[::Symbol, ::Object]).returns(T.nilable(::String)) }
   def kwargify(kwargs); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#58
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#59
   sig { params(block: T.nilable(::Proc)).returns(T.nilable(::String)) }
   def lambdafy(block); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#75
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#76
   sig { params(block: ::Proc).returns(::String) }
   def source_locationify(block); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#80
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#81
   sig { params(path: ::String).returns(::String) }
   def strip_pwd(path); end
 end
@@ -1676,7 +1633,6 @@ class Mocktail::Stubbing < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1689,8 +1645,6 @@ Mocktail::TYPED = T.let(T.unsafe(nil), TrueClass)
 # method replacements carried out with Mocktail.replace(ClassOrModule)
 #
 # source://mocktail//lib/mocktail/sorbet/mocktail/value/top_shelf.rb#7
-# The TopShelf is where we keep all the more global, dangerous state.
-# In particular, this is where Mocktail manages state related to singleton
 class Mocktail::TopShelf
   # source://mocktail//lib/mocktail/sorbet/mocktail/value/top_shelf.rb#19
   sig { void }
@@ -1778,7 +1732,6 @@ class Mocktail::TypeReplacement < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1798,7 +1751,6 @@ class Mocktail::TypeReplacementData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1814,7 +1766,6 @@ class Mocktail::UnsatisfyingCall < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1846,11 +1797,11 @@ Mocktail::VERSION = T.let(T.unsafe(nil), String)
 
 # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#4
 class Mocktail::ValidatesArguments
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#32
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#35
   sig { void }
   def initialize; end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#37
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#40
   sig { params(dry_call: ::Mocktail::Call).returns(::NilClass) }
   def validate(dry_call); end
 

data/script/build

@@ -33,8 +33,8 @@ require_relative "mocktail/sorbet"
 RUBY
 
 echo "----------> ❷ Generating sorbet sigs via tapioca in sub_projects/rbi_generator"
-cd sub_projects/rbi_generator
 rm -f rbi/mocktail-pregenerated.rbi
+cd sub_projects/rbi_generator
 rm -f sorbet/rbi/gems/mocktail@*.rbi
 bundle
 bundle exec tapioca gem --all --exclude=tapioca ast diff-lcs erubi netrc parser prettier_print racc rbi spoom syntax_tree thor unparser sorbet yard parallel yard-sorbet

data/src/mocktail/debug.rb

@@ -34,7 +34,7 @@ module Mocktail
       approved_call_sites = [
         /fulfills_stubbing.rb:(16|20)/,
         /validates_arguments.rb:(18|23)/,
-        /validates_arguments.rb:(21|26)/
+        /validates_arguments.rb:(23|28)/
       ]
       if internal_call_sites.any? && approved_call_sites.none? { |approved_call_site|
         internal_call_sites.first&.match?(approved_call_site)

data/src/mocktail/handles_dry_call/validates_arguments.rb

@@ -22,10 +22,13 @@ module Mocktail
     def self.optional(disable, &blk)
       return blk.call unless disable
 
+      previous = disabled?
       disable!
-      ret = blk.call
-      enable!
-      ret
+      begin
+        blk.call
+      ensure
+        Thread.current[:mocktail_arity_validation_disabled] = previous
+      end
     end
 
     sig { void }

data/src/mocktail/handles_dry_new_call.rb

@@ -1,5 +1,7 @@
 # typed: strict
 
+require_relative "share/folds_keywords_into_options_hash"
+
 module Mocktail
   class HandlesDryNewCall
     extend T::Sig
@@ -10,10 +12,13 @@ module Mocktail
       @logs_call = T.let(LogsCall.new, LogsCall)
       @fulfills_stubbing = T.let(FulfillsStubbing.new, FulfillsStubbing)
       @imitates_type = T.let(ImitatesType.new, ImitatesType)
+      @folds_keywords_into_options_hash = T.let(FoldsKeywordsIntoOptionsHash.new, FoldsKeywordsIntoOptionsHash)
     end
 
     sig { params(type: T::Class[T.all(T, Object)], args: T::Array[T.anything], kwargs: T::Hash[Symbol, T.anything], block: T.nilable(Proc)).returns(T.anything) }
     def handle(type, args, kwargs, block)
+      args, kwargs = @folds_keywords_into_options_hash.fold(type.instance_method(:initialize), args, kwargs)
+
       @validates_arguments.validate(Call.new(
         original_method: type.instance_method(:initialize),
         args: args,

data/src/mocktail/replaces_type/redefines_singleton_methods.rb

@@ -1,5 +1,7 @@
 # typed: strict
 
+require_relative "../share/folds_keywords_into_options_hash"
+
 module Mocktail
   class RedefinesSingletonMethods
     extend T::Sig
@@ -7,6 +9,7 @@ module Mocktail
     sig { void }
     def initialize
       @handles_dry_call = T.let(HandlesDryCall.new, HandlesDryCall)
+      @folds_keywords_into_options_hash = T.let(FoldsKeywordsIntoOptionsHash.new, FoldsKeywordsIntoOptionsHash)
     end
 
     sig { params(type: T.any(T::Class[T.anything], Module)).void }
@@ -20,10 +23,12 @@ module Mocktail
 
       declare_singleton_method_missing_errors!(type)
       handles_dry_call = @handles_dry_call
+      folds_keywords_into_options_hash = @folds_keywords_into_options_hash
       type_replacement.replacement_methods = type_replacement.original_methods&.map { |original_method|
         type.singleton_class.send(:undef_method, original_method.name)
         type.define_singleton_method original_method.name, ->(*args, **kwargs, &block) {
           if TopShelf.instance.singleton_methods_replaced?(type)
+            args, kwargs = folds_keywords_into_options_hash.fold(original_method, args, kwargs)
             handles_dry_call.handle(Call.new(
               singleton: true,
               double: type,

data/src/mocktail/share/folds_keywords_into_options_hash.rb

@@ -0,0 +1,25 @@
+# typed: strict
+
+module Mocktail
+  class FoldsKeywordsIntoOptionsHash
+    extend T::Sig
+
+    KEYWORD_PARAM_TYPES = T.let([:key, :keyreq, :keyrest, :nokey].freeze, T::Array[Symbol])
+
+    sig { void }
+    def initialize
+      @grabs_original_method_parameters = T.let(GrabsOriginalMethodParameters.new, GrabsOriginalMethodParameters)
+    end
+
+    # Ruby 3 passes keywords to a method with no keyword params as a trailing
+    # positional hash, but our generic (*args, **kwargs) lambdas always split
+    # them out, so fold them back in to match what the real method would see
+    sig { params(original_method: T.nilable(T.any(UnboundMethod, Method)), args: T::Array[T.anything], kwargs: T::Hash[Symbol, T.anything]).returns([T::Array[T.anything], T::Hash[Symbol, T.anything]]) }
+    def fold(original_method, args, kwargs)
+      return [args, kwargs] if kwargs.empty? || original_method.nil?
+      return [args, kwargs] if @grabs_original_method_parameters.grab(original_method).any? { |type, _| KEYWORD_PARAM_TYPES.include?(type) }
+
+      [[*args, kwargs], {}]
+    end
+  end
+end

data/src/mocktail/version.rb

@@ -8,5 +8,5 @@ module Mocktail
     Mocktail.send(:remove_const, :VERSION)
   end
 
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/sub_projects/rbi_generator/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    mocktail (3.0.0)
+    mocktail (3.0.1)
       sorbet-eraser (~> 0.3.1)
       sorbet-runtime (~> 0.5.9204)
 

data/sub_projects/sorbet_user/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    mocktail (3.0.0)
+    mocktail (3.0.1)
       sorbet-eraser (~> 0.3.1)
       sorbet-runtime (~> 0.5.9204)
 

data/sub_projects/sorbet_user/sorbet/rbi/gems/{mocktail@3.0.0.rbi → mocktail@3.0.1.rbi}

@@ -221,7 +221,6 @@ class Mocktail::Call < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -392,7 +391,6 @@ class Mocktail::DemoConfig < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -466,7 +464,6 @@ class Mocktail::Double < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -482,7 +479,6 @@ class Mocktail::DoubleData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -615,7 +611,6 @@ class Mocktail::FakeMethodData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -653,6 +648,32 @@ class Mocktail::FindsVerifiableCalls
   def find(recording, demo_config); end
 end
 
+# source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#4
+class Mocktail::FoldsKeywordsIntoOptionsHash
+  # source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#10
+  sig { void }
+  def initialize; end
+
+  # Ruby 3 passes keywords to a method with no keyword params as a trailing
+  # positional hash, but our generic (*args, **kwargs) lambdas always split
+  # them out, so fold them back in to match what the real method would see
+  #
+  # source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#18
+  # Ruby 3 passes keywords to a method with no keyword params as a trailing
+  # positional hash, but our generic (*args, **kwargs) lambdas always split
+  sig do
+    params(
+      original_method: T.nilable(T.any(::Method, ::UnboundMethod)),
+      args: T::Array[T.anything],
+      kwargs: T::Hash[::Symbol, T.anything]
+    ).returns([T::Array[T.anything], T::Hash[::Symbol, T.anything]])
+  end
+  def fold(original_method, args, kwargs); end
+end
+
+# source://mocktail//lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb#7
+Mocktail::FoldsKeywordsIntoOptionsHash::KEYWORD_PARAM_TYPES = T.let(T.unsafe(nil), Array)
+
 # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/fulfills_stubbing.rb#7
 class Mocktail::FulfillsStubbing
   # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/fulfills_stubbing.rb#11
@@ -731,13 +752,13 @@ class Mocktail::HandlesDryCall
   def handle(dry_call); end
 end
 
-# source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#4
+# source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#6
 class Mocktail::HandlesDryNewCall
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#8
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#10
   sig { void }
   def initialize; end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#16
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_new_call.rb#19
   sig do
     params(
       type: T::Class[T.all(::Object, ::T)],
@@ -1170,7 +1191,6 @@ class Mocktail::NoExplanationData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1192,7 +1212,6 @@ class Mocktail::Params < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1370,23 +1389,23 @@ class Mocktail::RedefinesNew
   def redefine(type); end
 end
 
-# source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#4
+# source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#6
 class Mocktail::RedefinesSingletonMethods
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#8
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#10
   sig { void }
   def initialize; end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#47
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#52
   sig { params(type: T.any(::Module, T::Class[T.anything])).void }
   def declare_singleton_method_missing_errors!(type); end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#13
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#16
   sig { params(type: T.any(::Module, T::Class[T.anything])).void }
   def redefine(type); end
 
   private
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#72
+  # source://mocktail//lib/mocktail/sorbet/mocktail/replaces_type/redefines_singleton_methods.rb#77
   sig { params(method: ::Method).returns(T::Boolean) }
   def sorbet_method_hook?(method); end
 end
@@ -1545,7 +1564,6 @@ class Mocktail::Signature < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1591,37 +1609,30 @@ class Mocktail::StringifiesCall
   private
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#46
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#47
   sig { params(args: T::Array[::Object]).returns(T.nilable(::String)) }
   def argify(args); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#29
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#30
   sig { params(call: ::Mocktail::Call, parens: T::Boolean).returns(T.nilable(::String)) }
   def args_to_s(call, parens: T.unsafe(nil)); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#64
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#65
   sig { params(block: T.nilable(::Proc), anonymous: T::Boolean).returns(T.nilable(::String)) }
   def blockify(block, anonymous:); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#52
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#53
   sig { params(kwargs: T::Hash[::Symbol, ::Object]).returns(T.nilable(::String)) }
   def kwargify(kwargs); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#58
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#59
   sig { params(block: T.nilable(::Proc)).returns(T.nilable(::String)) }
   def lambdafy(block); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#75
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#76
   sig { params(block: ::Proc).returns(::String) }
   def source_locationify(block); end
 
   # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#80
-  # source://mocktail//lib/mocktail/sorbet/mocktail/share/stringifies_call.rb#81
   sig { params(path: ::String).returns(::String) }
   def strip_pwd(path); end
 end
@@ -1676,7 +1687,6 @@ class Mocktail::Stubbing < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1778,7 +1788,6 @@ class Mocktail::TypeReplacement < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1798,7 +1807,6 @@ class Mocktail::TypeReplacementData < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1814,7 +1822,6 @@ class Mocktail::UnsatisfyingCall < ::T::Struct
 
   class << self
     # source://sorbet-runtime/0.5.11971/lib/types/struct.rb#13
-    # source://sorbet-runtime/0.5.10983/lib/types/struct.rb#13
     def inherited(s); end
   end
 end
@@ -1846,11 +1853,11 @@ Mocktail::VERSION = T.let(T.unsafe(nil), String)
 
 # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#4
 class Mocktail::ValidatesArguments
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#32
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#35
   sig { void }
   def initialize; end
 
-  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#37
+  # source://mocktail//lib/mocktail/sorbet/mocktail/handles_dry_call/validates_arguments.rb#40
   sig { params(dry_call: ::Mocktail::Call).returns(::NilClass) }
   def validate(dry_call); end
 

data/sub_projects/untyped_user/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    mocktail (3.0.0)
+    mocktail (3.0.1)
       sorbet-eraser (~> 0.3.1)
       sorbet-runtime (~> 0.5.9204)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocktail
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Justin Searls
@@ -137,6 +137,7 @@ files:
 - lib/mocktail/share/cleans_backtrace.rb
 - lib/mocktail/share/creates_identifier.rb
 - lib/mocktail/share/determines_matching_calls.rb
+- lib/mocktail/share/folds_keywords_into_options_hash.rb
 - lib/mocktail/share/stringifies_call.rb
 - lib/mocktail/share/stringifies_method_name.rb
 - lib/mocktail/simulates_argument_error.rb
@@ -195,6 +196,7 @@ files:
 - lib/mocktail/sorbet/mocktail/share/cleans_backtrace.rb
 - lib/mocktail/sorbet/mocktail/share/creates_identifier.rb
 - lib/mocktail/sorbet/mocktail/share/determines_matching_calls.rb
+- lib/mocktail/sorbet/mocktail/share/folds_keywords_into_options_hash.rb
 - lib/mocktail/sorbet/mocktail/share/stringifies_call.rb
 - lib/mocktail/sorbet/mocktail/share/stringifies_method_name.rb
 - lib/mocktail/sorbet/mocktail/simulates_argument_error.rb
@@ -397,6 +399,7 @@ files:
 - src/mocktail/share/cleans_backtrace.rb
 - src/mocktail/share/creates_identifier.rb
 - src/mocktail/share/determines_matching_calls.rb
+- src/mocktail/share/folds_keywords_into_options_hash.rb
 - src/mocktail/share/stringifies_call.rb
 - src/mocktail/share/stringifies_method_name.rb
 - src/mocktail/simulates_argument_error.rb
@@ -450,7 +453,7 @@ files:
 - sub_projects/sorbet_user/sorbet/rbi/gems/m@1.6.2.rbi
 - sub_projects/sorbet_user/sorbet/rbi/gems/method_source@1.1.0.rbi
 - sub_projects/sorbet_user/sorbet/rbi/gems/minitest@5.27.0.rbi
-- sub_projects/sorbet_user/sorbet/rbi/gems/mocktail@3.0.0.rbi
+- sub_projects/sorbet_user/sorbet/rbi/gems/mocktail@3.0.1.rbi
 - sub_projects/sorbet_user/sorbet/rbi/gems/netrc@0.11.0.rbi
 - sub_projects/sorbet_user/sorbet/rbi/gems/parallel@1.26.3.rbi
 - sub_projects/sorbet_user/sorbet/rbi/gems/parser@3.3.7.4.rbi