mocha 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db34295002c13283fa7653ae3a1474a77bf081f2
-  data.tar.gz: ce7b148d39f32c3e9d0c527d679d1295b6440b0a
+  metadata.gz: 41ba040450c12b37d2cce4a23948f3944b97a003
+  data.tar.gz: 386b73723224bcaf481cc15324ba0dbe5534e423
 SHA512:
-  metadata.gz: cfee63cd238bb06188c8c73bcd864c4b6c0e6d89e0433f85eb65ade2e1607c8557e370e448a6d98c5609a22db07d1f07240fb13c606323ae86694362b7342f0f
-  data.tar.gz: fb2ae63bf63e64df43d60d7ec48548b6410f8d4c594039b6abdf50d8f3fabb6c3c91fabd99920f97e1ff76e429135c0aca02bae217213cab313a65b47e784ae4
+  metadata.gz: 2c5537469c485a8fb71dc4c41a16355b5e9401eab0b157554f7f4c374b4b468b0a30ebd17fcd8b8c76b8cf4babdf2d3118e4147b5a65ca88d5c9a1ab7ded31c9
+  data.tar.gz: d0f420d06bf65eb02c49fbaa0077cb6f2c2d6f7f1ab41d5e622aec3ee761a2f0824ac2bdad2d602cfc83c508a11e3121e6166cbf61140801cbfd6ad3a7a4fc11

data/README.md

@@ -109,6 +109,7 @@ require 'mocha/mini_test'
 
 #### Known Issues
 
+* In Mocha v1.2.0 there is a scenario where stubbing a class method originally defined in a module hangs the Ruby interpreter due to [a bug in Ruby v2.3.1](https://bugs.ruby-lang.org/issues/12832). See #272. This was fixed in Mocha v1.2.1.
 * Stubbing an aliased class method, where the original method is defined in a module that's used to `extend` the class doesn't work in Ruby 1.8.x. See stub_method_defined_on_module_and_aliased_test.rb for an example of this behaviour.
 * 0.13.x versions cause a harmless, but annoying, deprecation warning when used with Rails 3.2.0-3.2.12, 3.1.0-3.1.10 & 3.0.0-3.0.19.
 * 0.11.x versions don't work with Rails 3.2.13 (`TypeError: superclass mismatch for class ExpectationError`). See #115.

data/RELEASE.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 1.2.1
+
+* Fixed #272. Workaround Ruby bug 12832 which caused interpreter to hang. See https://bugs.ruby-lang.org/issues/12832. Thanks to @chrisroos & @petems (6f1c8b9b, #273).
+
 ## 1.2.0
 
 * Always use prepended module to stub class & instance methods for Ruby v2+ - thanks to @grosser & @chrisroos (43d56671, #244)

data/lib/mocha/class_method.rb

@@ -40,11 +40,11 @@ module Mocha
     def hide_original_method
       if @original_visibility = method_visibility(method)
         begin
-          @original_method = stubbee._method(method)
           if RUBY_V2_PLUS
             @definition_target = PrependedModule.new
             stubbee.__metaclass__.__send__ :prepend, @definition_target
           else
+            @original_method = stubbee._method(method)
             if @original_method && @original_method.owner == stubbee.__metaclass__
               stubbee.__metaclass__.send(:remove_method, method)
             end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/acceptance/issue_272_test.rb

@@ -0,0 +1,52 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/setup'
+
+class Issue272Test < Mocha::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  module Mod
+    private
+
+    def foo
+      'original-foo'
+    end
+
+    def bar
+      'original-bar'
+    end
+  end
+
+  class Klass
+    extend Mod
+
+    class << self
+      public :foo
+      public :bar
+    end
+  end
+
+  def test_private_methods_in_module_used_to_extend_class_and_made_public
+    test_result = run_as_test do
+      Klass.stubs(:foo).returns('stubbed-foo')
+      # hangs in next line executing:
+      # `@original_method = stubbee._method(method)`
+      # in Mocha::ClassMethod#hide_original_method
+      # but only in Ruby v2.3, not v2.2
+      Klass.stubs(:bar).returns('stubbed-bar')
+      assert_equal 'stubbed-foo', Klass.foo
+      assert_equal 'stubbed-bar', Klass.bar
+    end
+    assert_passed(test_result)
+    assert_equal 'original-foo', Klass.foo
+    assert_equal 'original-bar', Klass.bar
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
@@ -236,6 +236,7 @@ files:
 - test/acceptance/expectations_on_multiple_methods_test.rb
 - test/acceptance/expected_invocation_count_test.rb
 - test/acceptance/failure_messages_test.rb
+- test/acceptance/issue_272_test.rb
 - test/acceptance/issue_65_test.rb
 - test/acceptance/issue_70_test.rb
 - test/acceptance/mocha_example_test.rb