mocktail 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb64f90875e53a9bfd5b4d995f8526eb6695dd9bd8a88c850b02eed851cb96d
-  data.tar.gz: ae2b4443a3740c375c70e7e490cbe3463d9672f17665ae47930b6ee614e9891d
+  metadata.gz: 0aa187046d2e07280352ba6f0296f5573bda910acb111e06d0932f0e2518064e
+  data.tar.gz: c3e5e74d586969ea5dd88dc86c20a9d2e6f223f1bb8a438325583a8d8fb20bae
 SHA512:
-  metadata.gz: de8d47071e93c4d406391a1155dea9b6a1a9ac89f56422ae29e6dda5f134c9e5e724ec8006aba833b5ff19d9d2dff4550384bc349506f5ab9cefe3fd2185af1d
-  data.tar.gz: 5bf88d0aadc08fe9a9380312cf491146439e72e335091e2e79849196b74e93aba20b0fac2d122152a4661008ee243b5b3b39cb6408fc776b2cc2567ffca0924f
+  metadata.gz: 224a377d46c11b830b90a828e6a0c294e940c3492cde42fda9aa0f865b97cdc69773571d4464bd4bbe185aa29e6860c5a4c2b3b87a458382a84b330ddce5df3e
+  data.tar.gz: 10562536842265afc7f6bef9fa63a8ebab657e78941f13bc0e38cb49cf8f43785d1d926d0f5afe103165d337fe2163cba88aa4aee220004c8a2494e5f5493d4c

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.1.3
+
+* Improve the robustness of how we call the original methods on doubles &
+  replaced class methods on mocks internally by Mocktail to avoid behavior being
+  altered by how users configure mock objects
+
+# 1.1.2
+
+* Fix cases where classes that redefine built-in methods could cause issues when
+  Mocktail in turn called those methods internally
+  [#15](https://github.com/testdouble/mocktail/pull/15)
+
 # 1.1.1
 
 * Improve output for undefined singleton methods

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mocktail (1.1.2)
+    mocktail (1.1.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/mocktail/handles_dry_call/fulfills_stubbing/describes_unsatisfied_stubbing.rb

@@ -1,19 +1,18 @@
 require_relative "../../share/cleans_backtrace"
-require_relative "../../share/compares_safely"
+require_relative "../../share/bind"
 
 module Mocktail
   class DescribesUnsatisfiedStubbing
     def initialize
       @cleans_backtrace = CleansBacktrace.new
-      @compares_safely = ComparesSafely.new
     end
 
     def describe(dry_call)
       UnsatisfyingCall.new(
         call: dry_call,
         other_stubbings: Mocktail.cabinet.stubbings.select { |stubbing|
-          @compares_safely.compare(dry_call.double, stubbing.recording.double) &&
-            @compares_safely.compare(dry_call.method, stubbing.recording.method)
+          Bind.call(dry_call.double, :==, stubbing.recording.double) &&
+            dry_call.method == stubbing.recording.method
         },
         backtrace: @cleans_backtrace.clean(Error.new).backtrace
       )

data/lib/mocktail/share/bind.rb

@@ -0,0 +1,14 @@
+module Mocktail
+  module Bind
+    def self.call(mock, method_name, *args, **kwargs, &blk)
+      if Mocktail.cabinet.double_for_instance(mock)
+        Object.instance_method(method_name).bind_call(mock, *args, **kwargs, &blk)
+      elsif (type_replacement = TopShelf.instance.type_replacement_if_exists_for(mock)) &&
+          (og_method = type_replacement.original_methods&.find { |m| m.name == method_name })
+        og_method.call(*args, **kwargs, &blk)
+      else
+        mock.__send__(method_name, *args, **kwargs, &blk)
+      end
+    end
+  end
+end

data/lib/mocktail/share/determines_matching_calls.rb

@@ -1,14 +1,10 @@
-require_relative "compares_safely"
+require_relative "bind"
 
 module Mocktail
   class DeterminesMatchingCalls
-    def initialize
-      @compares_safely = ComparesSafely.new
-    end
-
     def determine(real_call, demo_call, demo_config)
-      @compares_safely.compare(real_call.double, demo_call.double) &&
-        @compares_safely.compare(real_call.method, demo_call.method) &&
+      Bind.call(real_call.double, :==, demo_call.double) &&
+        real_call.method == demo_call.method &&
 
         # Matcher implementation will replace this:
         args_match?(real_call.args, demo_call.args, demo_config.ignore_extra_args) &&
@@ -55,11 +51,11 @@ module Mocktail
     end
 
     def match?(real_arg, demo_arg)
-      if demo_arg.respond_to?(:is_mocktail_matcher?) &&
+      if Bind.call(demo_arg, :respond_to?, :is_mocktail_matcher?) &&
           demo_arg.is_mocktail_matcher?
         demo_arg.match?(real_arg)
       else
-        demo_arg == real_arg # TODO <-- test if mock object and call safe compare if so, otherwise ==
+        Bind.call(demo_arg, :==, real_arg)
       end
     end
   end

data/lib/mocktail/simulates_argument_error/transforms_params.rb

@@ -1,22 +1,18 @@
-require_relative "../share/compares_safely"
+require_relative "../share/bind"
 
 module Mocktail
   class TransformsParams
-    def initialize
-      @compares_safely = ComparesSafely.new
-    end
-
     def transform(dry_call)
       params = dry_call.original_method.parameters
 
       Signature.new(
         positional_params: Params.new(
           all: params.select { |t, _|
-            [:req, :opt, :rest].any? { |param_type| @compares_safely.compare(t, param_type) }
+            [:req, :opt, :rest].any? { |param_type| Bind.call(t, :==, param_type) }
           }.map { |_, name| name },
-          required: params.select { |t, _| @compares_safely.compare(t, :req) }.map { |_, n| n },
-          optional: params.select { |t, _| @compares_safely.compare(t, :opt) }.map { |_, n| n },
-          rest: params.find { |t, _| @compares_safely.compare(t, :rest) } & [1]
+          required: params.select { |t, _| Bind.call(t, :==, :req) }.map { |_, n| n },
+          optional: params.select { |t, _| Bind.call(t, :==, :opt) }.map { |_, n| n },
+          rest: params.find { |t, _| Bind.call(t, :==, :rest) } & [1]
         ),
         positional_args: dry_call.args,
 
@@ -24,13 +20,13 @@ module Mocktail
           all: params.select { |type, _|
             [:keyreq, :key, :keyrest].include?(type)
           }.map { |_, name| name },
-          required: params.select { |t, _| @compares_safely.compare(t, :keyreq) }.map { |_, n| n },
-          optional: params.select { |t, _| @compares_safely.compare(t, :key) }.map { |_, n| n },
-          rest: params.find { |t, _| @compares_safely.compare(t, :keyrest) } & [1]
+          required: params.select { |t, _| Bind.call(t, :==, :keyreq) }.map { |_, n| n },
+          optional: params.select { |t, _| Bind.call(t, :==, :key) }.map { |_, n| n },
+          rest: params.find { |t, _| Bind.call(t, :==, :keyrest) } & [1]
         ),
         keyword_args: dry_call.kwargs,
 
-        block_param: params.find { |t, _| @compares_safely.compare(t, :block) } & [1],
+        block_param: params.find { |t, _| Bind.call(t, :==, :block) } & [1],
         block_arg: dry_call.block
       )
     end

data/lib/mocktail/value/cabinet.rb

@@ -1,4 +1,4 @@
-require_relative "../share/compares_safely"
+require_relative "../share/bind"
 
 # The Cabinet stores all thread-local state, so anything that goes here
 # is guaranteed by Mocktail to be local to the currently-running thread
@@ -8,7 +8,6 @@ module Mocktail
     attr_reader :calls, :stubbings, :unsatisfying_calls
 
     def initialize
-      @compares_safely = ComparesSafely.new
       @doubles = []
       @calls = []
       @stubbings = []
@@ -48,18 +47,21 @@ module Mocktail
     end
 
     def double_for_instance(thing)
-      @doubles.find { |double| @compares_safely.compare(double.dry_instance, thing) }
+      @doubles.find { |double|
+        # Intentionally calling directly to avoid an infinite recursion in Bind.call
+        Object.instance_method(:==).bind_call(double.dry_instance, thing)
+      }
     end
 
     def stubbings_for_double(double)
       @stubbings.select { |stubbing|
-        @compares_safely.compare(stubbing.recording.double, double.dry_instance)
+        Bind.call(stubbing.recording.double, :==, double.dry_instance)
       }
     end
 
     def calls_for_double(double)
       @calls.select { |call|
-        @compares_safely.compare(call.double, double.dry_instance)
+        Bind.call(call.double, :==, double.dry_instance)
       }
     end
   end

data/lib/mocktail/version.rb

@@ -1,3 +1,3 @@
 module Mocktail
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocktail
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -67,8 +67,8 @@ files:
 - lib/mocktail/replaces_type/redefines_new.rb
 - lib/mocktail/replaces_type/redefines_singleton_methods.rb
 - lib/mocktail/resets_state.rb
+- lib/mocktail/share/bind.rb
 - lib/mocktail/share/cleans_backtrace.rb
-- lib/mocktail/share/compares_safely.rb
 - lib/mocktail/share/creates_identifier.rb
 - lib/mocktail/share/determines_matching_calls.rb
 - lib/mocktail/share/stringifies_call.rb
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Take your objects, and make them a double

data/lib/mocktail/share/compares_safely.rb

@@ -1,7 +0,0 @@
-module Mocktail
-  class ComparesSafely
-    def compare(thing, other_thing)
-      Object.instance_method(:==).bind_call(thing, other_thing)
-    end
-  end
-end