spy 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3906b9e65a981746a6dc4e51106ed64fc925478cb73335eb8a9d46ae9fc31931
-  data.tar.gz: 85e19b544c6ccb98616dd846db8263da3d0e8abcfd2158a5749d8988c5dc32e8
+  metadata.gz: eb02855e84ed97ae778d5983b8bba3e5839a6593416336a18240beb759f82b7f
+  data.tar.gz: df92498cacaab913d6d71d6d3e34778140d7367f741a1f1d750e96cbc2353a19
 SHA512:
-  metadata.gz: 57544c0872ff818dc065037e1e2a10c34b1edb698ad84ebf1e184aa190d24c8663d51d011619bb6a1024c93f1d94a03a8bd6578274605a56f0b0ba06aabf6abc
-  data.tar.gz: 43b7ca82d10759bb6083fdd76b27941425cefbcc63bc2b8a585b34d3c8e2c2659f24c1f4f32843ee1c1b8f3aee1d64c127fb769774430e77a31ea7005aeebbcb
+  metadata.gz: 72e822dfc3517b8bcc4d26d9ffc0db333acd4526673a765de0a19f4396292834bd0402a307d31d6ba226c5f9017a2813fba53738d5784dc00fc0aa0e66720869
+  data.tar.gz: 35b2c58f79ef8da6c462ba1a5739ddc2705df1544a2f75c14ecb9731c60b5f33337f94056dbf1803480699d6729f0410985194cbfe4d376852cf5417d352b8c2

data/lib/spy/subroutine.rb

@@ -84,7 +84,7 @@ module Spy
       raise NeverHookedError, "'#{method_name}' method has not been hooked" unless hooked?
 
       method_owner.send(:remove_method, method_name)
-      if original_method && method_owner == original_method.owner
+      if original_method
         original_method.owner.send(:define_method, method_name, original_method)
         original_method.owner.send(original_method_visibility, method_name) if original_method_visibility
       end
@@ -217,11 +217,7 @@ module Spy
           call_plan(build_call_through_plan(object), block, *args)
         elsif @plan
           check_for_too_many_arguments!(@plan)
-          if base_object.is_a? Class
-            call_plan(@plan, block, object, *args)
-          else
-            call_plan(@plan, block, *args)
-          end
+          call_plan(@plan, block, *args)
         end
     ensure
       calls << CallLog.new(object, called_from, args, block, result)

data/lib/spy/version.rb

@@ -1,3 +1,3 @@
 module Spy
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/integration/test_class_method.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class TestClassMethod < Minitest::Test
+  def teardown
+    Spy::Agency.instance.dissolve!
+  end
+
+  def test_and_return
+    klass = Class.new do
+      def self.class_method(*args, &block)
+      end
+    end
+    received_args = nil
+    received_block = nil
+    Spy.on(klass, :class_method).and_return do |*args, &block|
+      received_args = args
+      received_block = block
+    end
+    block = -> {}
+    klass.class_method(:a, :b, &block)
+    assert_equal [:a, :b], received_args
+    assert_equal block, received_block
+  end
+end

data/test/spy/test_unhook.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+module Spy
+  class TestUnhook < Minitest::Test
+    module ModuleFunctionStyle
+      extend self
+
+      def hello
+        'hello world'
+      end
+    end
+
+    module Injected
+      def hello
+        'hello world'
+      end
+    end
+
+    class ModuleInjectedStyle
+      include Injected
+    end
+
+    class ModuleExtendedStyle
+      extend Injected
+    end
+
+    class SingletonMethodStyle
+      def self.hello
+        'hello world'
+      end
+    end
+
+    class InstanceMethodStyle
+      def hello
+        'hello world'
+      end
+    end
+
+    def test_ModuleFunctionStyle
+      spy = Spy.on(ModuleFunctionStyle, :hello).and_return('yo')
+      assert_equal ModuleFunctionStyle.hello, 'yo'
+      spy.unhook
+      assert_equal ModuleFunctionStyle.hello, 'hello world'
+    end
+
+    def test_ModuleInjectedStyle
+      instance = ModuleInjectedStyle.new
+      spy = Spy.on(instance, :hello).and_return('yo')
+      assert_equal instance.hello, 'yo'
+      spy.unhook
+      assert_equal instance.hello, 'hello world'
+    end
+
+    def test_ModuleExtendedStyle
+      spy = Spy.on(ModuleExtendedStyle, :hello).and_return('yo')
+      assert_equal ModuleExtendedStyle.hello, 'yo'
+      spy.unhook
+      assert_equal ModuleExtendedStyle.hello, 'hello world'
+    end
+
+    def test_SingletonMethodStyle
+      spy = Spy.on(SingletonMethodStyle, :hello).and_return('yo')
+      assert_equal SingletonMethodStyle.hello, 'yo'
+      spy.unhook
+      assert_equal SingletonMethodStyle.hello, 'hello world'
+    end
+
+    def test_InstanceMethodStyle
+      instance = InstanceMethodStyle.new
+      spy = Spy.on(instance, :hello).and_return('yo')
+      assert_equal instance.hello, 'yo'
+      spy.unhook
+      assert_equal instance.hello, 'hello world'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ryan Ong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -157,12 +157,14 @@ files:
 - spec/spy/to_ary_spec.rb
 - spy.gemspec
 - test/integration/test_api.rb
+- test/integration/test_class_method.rb
 - test/integration/test_constant_spying.rb
 - test/integration/test_instance_method.rb
 - test/integration/test_mocking.rb
 - test/integration/test_subroutine_spying.rb
 - test/spy/test_mock.rb
 - test/spy/test_subroutine.rb
+- test/spy/test_unhook.rb
 - test/support/pen.rb
 - test/test_helper.rb
 homepage: https://github.com/ryanong/spy
@@ -184,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: A simple modern mocking library that uses the spy pattern and checks method's
@@ -207,11 +209,13 @@ test_files:
 - spec/spy/stub_spec.rb
 - spec/spy/to_ary_spec.rb
 - test/integration/test_api.rb
+- test/integration/test_class_method.rb
 - test/integration/test_constant_spying.rb
 - test/integration/test_instance_method.rb
 - test/integration/test_mocking.rb
 - test/integration/test_subroutine_spying.rb
 - test/spy/test_mock.rb
 - test/spy/test_subroutine.rb
+- test/spy/test_unhook.rb
 - test/support/pen.rb
 - test/test_helper.rb