mocha 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8646b69b6a5163de10f8bbc6dd5e77b090d451
-  data.tar.gz: 42bde3df9467a0a8eac75c3ca816565a9f967feb
+  metadata.gz: fee7267881fbeec218036679d2d7002f5a2f0f30
+  data.tar.gz: 8801ccb9858bbafe1a422702ca1d91e19d31c777
 SHA512:
-  metadata.gz: 4839f1d90cc07fc20e1662c00a51e6406ac612cbe0c05d25e8abe16a3845eeb8369daf2e516f97e4f8ddd277d93cdd9db47ca9c76f6aa1fab7cbe10ce4b429fd
-  data.tar.gz: e36f0c3f28b5d58fbb3467ec305458ef013660df54f465440d5e249160c79ae6b2f622aad0a8d4d2b78272f758726891178267011fa107c59081c89bad42e70b
+  metadata.gz: a1a6ca8a2301842c8ecba0db5df9223232af8076e3d4745763307264c635f68ccb2ff13e8b359dad1d03950341f4fd226cbbda3ef6e22d3bcdea140b776a449e
+  data.tar.gz: 2cc8b79a37943f4039764780c9c602d30d63e083e6bf375937e387ef6e3f08369f8669dc0b55e99216f15aa6672f9a6033dc52a91e08a172f55b0c59d7f7bc6f

data/CONTRIBUTING.md

@@ -0,0 +1,12 @@
+* Pull requests are welcomed.
+* Fork the repository.
+* Make your changes in a branch.
+* Add tests for new behaviour. Modify/remove existing tests for changes to existing behaviour.
+* Run `bin/build-matrix` from the root directory and ensure all the tests pass.
+  * This script depends on `rbenv` being installed.
+  * You must have all the ruby versions listed in `.travis.yml` under the `rvm` key installed (currently 1.8.7, 1.9.3 & 2.0.0).
+  * I use `rbenv-aliases` to alias the patch versions.
+  * Note that the build matrix takes quite a while to run.
+* Send us a pull request from your fork/branch.
+* Wait for your pull request to build on [Travis CI](https://travis-ci.org/freerange/mocha).
+* I will not accept pull requests with failing tests.

data/README.md

@@ -258,18 +258,6 @@ See the [documentation](http://gofreerange.com/mocha/docs/Mocha/Mock.html) for `
 * [Mock Roles Not Objects](http://www.jmock.org/oopsla2004.pdf)
 * [jMock](http://www.jmock.org/)
 
-### Contributing
-
-* Fork the repository.
-* Make your changes in a branch.
-* Add tests for new behaviour. Modify existing tests for changes to existing behaviour.
-* Run `bin/build-matrix` from the root directory and ensure all the tests pass.
-  * This script depends on `rbenv` being installed.
-  * You must have all the ruby versions listed in `.travis.yml` under the `rvm` key installed (currently 1.8.7, 1.9.3 & 2.0.0).
-  * I use `rbenv-aliases` to alias the patch versions.
-  * Note that the build matrix takes quite a while to run.
-* Send us a pull request from your fork/branch.
-
 ### Contributors
 
 See this [list of contributors](https://github.com/freerange/mocha/graphs/contributors).

data/RELEASE.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## 1.1.0
+
+* Set visibility of any instance stub method.
+* Stub methods with a prepended method if there are other prepended methods. Thanks to @mrsimo.
+* Improve docs for `Mock#responds_like` & `#responds_like_instance_of`.
+* Use GitHub convention for instructions on contributing to Mocha.
+* Fix typos in docs. Thanks to @10io
+
 ## 1.0.0
 
 ### External changes

data/lib/mocha/any_instance_method.rb

@@ -25,6 +25,8 @@ module Mocha
             end
             stubbee.send(:remove_method, method)
           end
+
+          include_prepended_module if RUBY_VERSION >= '2.0'
         rescue NameError
           # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end
@@ -32,15 +34,18 @@ module Mocha
     end
 
     def define_new_method
-      stubbee.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
+      definition_target.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
         def #{method}(*args, &block)
           self.class.any_instance.mocha.method_missing(:#{method}, *args, &block)
         end
       CODE
+      if @original_visibility
+        Module.instance_method(@original_visibility).bind(definition_target).call(method)
+      end
     end
 
     def remove_new_method
-      stubbee.send(:remove_method, method)
+      definition_target.send(:remove_method, method)
     end
 
     def restore_original_method
@@ -57,6 +62,23 @@ module Mocha
       return false
     end
 
+    private
+
+    def include_prepended_module
+      possible_prepended_modules = stubbee.ancestors.take_while do |mod|
+        !(Class === mod)
+      end
+
+      if possible_prepended_modules.any?
+        @definition_target = PrependedModule.new
+        stubbee.__send__ :prepend, @definition_target
+      end
+    end
+
+    def definition_target
+      @definition_target ||= stubbee
+    end
+
   end
 
 end

data/lib/mocha/class_method.rb

@@ -4,6 +4,8 @@ module Mocha
 
   class ClassMethod
 
+    PrependedModule = Class.new(Module)
+
     attr_reader :stubbee, :method
 
     def initialize(stubbee, method)
@@ -47,6 +49,8 @@ module Mocha
           if @original_method && @original_method.owner == stubbee.__metaclass__
             stubbee.__metaclass__.send(:remove_method, method)
           end
+
+          include_prepended_module if RUBY_VERSION >= '2.0'
         rescue NameError
           # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end
@@ -54,18 +58,18 @@ module Mocha
     end
 
     def define_new_method
-      stubbee.__metaclass__.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
+      definition_target.class_eval(<<-CODE, __FILE__, __LINE__ + 1)
         def #{method}(*args, &block)
           mocha.method_missing(:#{method}, *args, &block)
         end
       CODE
       if @original_visibility
-        Module.instance_method(@original_visibility).bind(stubbee.__metaclass__).call(method)
+        Module.instance_method(@original_visibility).bind(definition_target).call(method)
       end
     end
 
     def remove_new_method
-      stubbee.__metaclass__.send(:remove_method, method)
+      definition_target.send(:remove_method, method)
     end
 
     def restore_original_method
@@ -101,6 +105,23 @@ module Mocha
       __metaclass__.public_method_defined?(symbol) || __metaclass__.protected_method_defined?(symbol) || __metaclass__.private_method_defined?(symbol)
     end
 
+    private
+
+    def include_prepended_module
+      possible_prepended_modules = stubbee.__metaclass__.ancestors.take_while do |mod|
+        !(Class === mod)
+      end
+
+      if possible_prepended_modules.any?
+        @definition_target = PrependedModule.new
+        stubbee.__metaclass__.__send__ :prepend, @definition_target
+      end
+    end
+
+    def definition_target
+      @definition_target ||= stubbee.__metaclass__
+    end
+
   end
 
 end

data/lib/mocha/mock.rb

@@ -170,6 +170,8 @@ module Mocha
     #
     # The {Mock} instance will delegate its +#respond_to?+ method to the +responder+.
     #
+    # Note that the methods on +responder+ are never actually invoked.
+    #
     # @param [Object, #respond_to?] responder an object used to determine whether {Mock} instance should +#respond_to?+ to an invocation.
     # @return [Mock] the same {Mock} instance, thereby allowing invocations of other {Mock} methods to be chained.
     # @see #responds_like_instance_of
@@ -222,6 +224,8 @@ module Mocha
     #
     # The {Mock} instance will delegate its +#respond_to?+ method to the responder instance.
     #
+    # Note that the methods on the responder instance are never actually invoked.
+    #
     # @param [Class] responder_class a class used to determine whether {Mock} instance should +#respond_to?+ to an invocation.
     # @return [Mock] the same {Mock} instance, thereby allowing invocations of other {Mock} methods to be chained.
     # @see #responds_like

data/lib/mocha/object_methods.rb

@@ -35,7 +35,7 @@ module Mocha
 
     # Adds an expectation that the specified method must be called exactly once with any parameters.
     #
-    # The original implementation of the method is replaced during the test and then restored at the end of the test. The temporary replacement method has the same visibilty as the original method.
+    # The original implementation of the method is replaced during the test and then restored at the end of the test. The temporary replacement method has the same visibility as the original method.
     #
     # @param [Symbol,String] method_name name of expected method
     # @param [Hash] expected_methods_vs_return_values expected method name symbols as keys and corresponding return values as values - these expectations are setup as if {#expects} were called multiple times.
@@ -84,7 +84,7 @@ module Mocha
 
     # Adds an expectation that the specified method may be called any number of times with any parameters.
     #
-    # The original implementation of the method is replaced during the test and then restored at the end of the test. The temporary replacement method has the same visibilty as the original method.
+    # The original implementation of the method is replaced during the test and then restored at the end of the test. The temporary replacement method has the same visibility as the original method.
     #
     # @param [Symbol,String] method_name name of stubbed method
     # @param [Hash] stubbed_methods_vs_return_values stubbed method name symbols as keys and corresponding return values as values - these stubbed methods are setup as if {#stubs} were called multiple times.

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/acceptance/prepend_test.rb

@@ -0,0 +1,88 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/setup'
+
+class PrependTest < Mocha::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  if RUBY_VERSION >= '2.0'
+
+    module Mod1
+      def my_method
+        super + " World"
+      end
+    end
+
+    module Mod2
+      def my_method
+        super + " Wide"
+      end
+    end
+
+    class Klass1
+      prepend Mod1
+      prepend Mod2
+
+      def my_method
+        "Hello"
+      end
+    end
+
+    class Klass2
+      class << self
+        prepend Mod1
+        prepend Mod2
+
+        def my_method
+          "Hello"
+        end
+      end
+    end
+
+    def test_stubbing_any_instance_with_multiple_prepended_methods
+      assert_snapshot_unchanged(Klass1) do
+        test_result = run_as_test do
+          Klass1.any_instance.stubs(:my_method).returns("Bye World")
+          assert_equal "Bye World", Klass1.new.my_method
+        end
+        assert_passed(test_result)
+      end
+      assert_equal "Hello World Wide", Klass1.new.my_method
+    end
+
+    def test_stubbing_instance_with_multiple_prepended_methods
+      object = Klass1.new
+
+      assert_snapshot_unchanged(object) do
+        test_result = run_as_test do
+          object.stubs(:my_method).returns("Bye World")
+          assert_equal "Bye World", object.my_method
+          assert_equal "Hello World Wide", Klass1.new.my_method
+        end
+        assert_passed(test_result)
+      end
+      assert_equal "Hello World Wide", object.my_method
+    end
+
+    def test_stubbing_a_prepended_class_method
+      assert_snapshot_unchanged(Klass2) do
+        test_result = run_as_test do
+          Klass2.stubs(:my_method).returns("Bye World")
+          assert_equal "Bye World", Klass2.my_method
+        end
+        assert_passed(test_result)
+      end
+      assert_equal "Hello World Wide", Klass2.my_method
+    end
+
+  end
+
+end

data/test/acceptance/stub_any_instance_method_test.rb

@@ -13,7 +13,7 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
-  def test_should_stub_method_within_test
+  def test_should_stub_public_method_within_test
     klass = Class.new do
       def my_instance_method
         :original_return_value
@@ -63,6 +63,25 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     assert_equal :original_return_value, instance.my_unprotected_instance_method
   end
 
+  def test_should_stub_protected_method_within_test
+    klass = Class.new do
+      def my_instance_method
+        :original_return_value
+      end
+      protected :my_instance_method
+      def self.protected(*args); end
+      def my_unprotected_instance_method
+        my_instance_method
+      end
+    end
+    instance = klass.new
+    test_result = run_as_test do
+      klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
+      assert_method_visiblity instance, :my_instance_method, :protected
+    end
+    assert_passed(test_result)
+  end
+
   def test_should_leave_stubbed_private_method_unchanged_after_test
     klass = Class.new do
       def my_instance_method
@@ -79,6 +98,22 @@ class StubAnyInstanceMethodTest < Mocha::TestCase
     assert_equal :original_return_value, instance.send(:my_instance_method)
   end
 
+  def test_should_stub_private_method_within_test
+    klass = Class.new do
+      def my_instance_method
+        :original_return_value
+      end
+      private :my_instance_method
+      def self.private(*args); end
+    end
+    instance = klass.new
+    test_result = run_as_test do
+      klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
+      assert_method_visiblity instance, :my_instance_method, :private
+    end
+    assert_passed(test_result)
+  end
+
   def test_should_reset_expectations_after_test
     klass = Class.new do
       def my_instance_method

data/test/assertions.rb

@@ -1,6 +1,6 @@
 module Assertions
   def assert_method_visiblity(object, method_name, visiblity)
     method_key = RUBY_VERSION < '1.9' ? method_name.to_s : method_name.to_sym
-    assert object.send("#{visiblity}_methods", false).include?(method_key)
+    assert object.send("#{visiblity}_methods", false).include?(method_key), "#{method_name} is not #{visiblity}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - .gemtest
 - .yardopts
+- CONTRIBUTING.md
 - COPYING.md
 - Gemfile
 - MIT-LICENSE.md
@@ -231,6 +232,7 @@ files:
 - test/acceptance/optional_parameters_test.rb
 - test/acceptance/parameter_matcher_test.rb
 - test/acceptance/partial_mocks_test.rb
+- test/acceptance/prepend_test.rb
 - test/acceptance/raise_exception_test.rb
 - test/acceptance/return_value_test.rb
 - test/acceptance/sequence_test.rb
@@ -355,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mocha
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library